summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Fredrik Kalager Schaller <uraeus@src.gnome.org>2006-02-23 09:16:47 +0000
committerChristian Fredrik Kalager Schaller <uraeus@src.gnome.org>2006-02-23 09:16:47 +0000
commit9976d059c74f6ac0801d807b791b363855909a3e (patch)
tree7fdddb1a7d16734cb05fdc329d9604b1729f6cf9
parent60a416322b7f0bd7952ee2da2311ab91c4e637a5 (diff)
downloadtotem-9976d059c74f6ac0801d807b791b363855909a3e.tar.gz
update licensing exception text
-rw-r--r--COPYING11
-rw-r--r--ChangeLog6
2 files changed, 13 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index c6c72f5d6..1ab9dfd82 100644
--- a/COPYING
+++ b/COPYING
@@ -342,7 +342,10 @@ consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
-The Totem project hereby grant permission for non-gpl compatible GStreamer
-plugins to be used and distributed together with GStreamer and Totem. This
-permission are above and beyond the permissions granted by the GPL license
-Totem is covered by.
+The Totem project hereby grants permission for non-GPL compatible
+GStreamer plugins to be used and distributed together with GStreamer and
+Totem. This permission is above and beyond the permissions granted by
+the GPL licensei by which Totem is covered. If you modify this code, you may
+extend this exception to your version of the code, but you are not obligated
+to do so. If you do not wish to do so, delete this exception statement from
+your version.
diff --git a/ChangeLog b/ChangeLog
index 754d04947..f7963275d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-23 Christian Schaller <uraeus at gnome dot org>
+
+ * COPYING: update exception text with spelling and language
+ fixes. I guess the text in all the source files should ideally
+ be updated too.
+
2006-02-21 Tim-Philipp Müller <tim at centricular dot net>
* src/backend/bacon-video-widget-gst-0.10.c: