Relicense to GPL-3, as required by the combination of Apache and GPL-…

…2 code.
Karmasphere · Aug 2, 2011 · 7078361 · 7078361
1 parent 10cc744
commit 7078361
Show file tree

Hide file tree

Showing 4 changed files with 679 additions and 341 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.out
+*.lzo
 docs/*.png
 build
 dist

diff --git a/COPYING b/COPYING
@@ -1,5 +1,5 @@
-This package is licensed under the GPL, version 2. A copy of that
-license is included in the file GPL-2.
+This package is licensed under the GPL, version 3. A copy of that
+license is included in the file GPL-3.
 
 In addition, some files contain headers which grant additional rights,
 however those additional rights apply only to the files in which they

diff --git a/GPL-2 b/GPL-2