summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Geddes <vgeddes@src.gnome.org>2007-03-20 19:52:04 +0000
committerVincent Geddes <vgeddes@src.gnome.org>2007-03-20 19:52:04 +0000
commitd4ef845026052b8e7a7e84655a0652cb88b7e64d (patch)
tree70f4cb8ac96910804a290198e0ca941fb8e8003f
parent948f99cae1ad8e36298322caef5db46a6db4f240 (diff)
downloadglade-d4ef845026052b8e7a7e84655a0652cb88b7e64d.tar.gz
Update licensing information. After we reorganised the package structure,
* COPYING: Update licensing information. After we reorganised the package structure, the LGPL-licensed pixmaps were put into different directories. svn path=/branches/gnome-2-18/; revision=1221
-rw-r--r--COPYING14
-rw-r--r--ChangeLog6
2 files changed, 15 insertions, 5 deletions
diff --git a/COPYING b/COPYING
index 23a5e980..9d3204cd 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,11 @@
+This package is licensed under the GNU GPL. Please see
+COPYING.GPL for the full text of the GPL license.
-The pixmaps included in this package under the `pixmaps' directory are licensed under
-the GNU LGPL license. Please see COPYING.LGPL for the full text of this license.
+As an exception, some artwork is licensed under the GNU LGPL. Specifically, all
+PNG image files located under the following directories are licensed under
+the LGPL.
-The remainder of this package is licensed under the GNU GPL.
-Please see COPYING.GPL for the full text of this license.
-
+ - plugins/gtk+/icons
+ - plugins/gnome/icons
+
+Please see COPYING.LGPL for the full text of the LGPL license.
diff --git a/ChangeLog b/ChangeLog
index 0be93ed0..b925123b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-15 Vincent Geddes <vincent.geddes@gmail.com>
+
+ * COPYING: Update licensing information. After we reorganised
+ the package structure, the LGPL-licensed pixmaps were put into
+ different directories.
+
2006-03-13 Olivier Delhomme <olivierdelhomme@gmail.com>
* gladeui/glade-utils.c: Fixed broken statement in