see #9590 - JSON code is not compatible with GPL

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6853 0c6e7542-c601-0410-84e7-c038aed88b3b
JOSM · Feb 14, 2014 · d89b091 · d89b091
1 parent bd79723
commit d89b091
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/LICENSE b/LICENSE
@@ -10,8 +10,9 @@ http://www.gnu.org/licenses/gpl.html
 The GPL v2 is accessible here:
 http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 
-When compiled with Bzip2 support code included the whole software is 
-licensed GPL v3 or later.
+The JOSM repository contains files licensed under the Apache License, Version 2.0
+(as stated at the beginning of the file). When compiled with any of this code
+included, the whole software is licensed under GPL v3.