summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2008-04-09 09:33:17 +0000
committerBastien Nocera <hadess@src.gnome.org>2008-04-09 09:33:17 +0000
commit3d88aa1a7701fc47762ec11be30565b8b7c23f58 (patch)
tree91942941b0bd8de2a42678cd50a7627471d20f9f
parent278b2810b48c76b33da55e1454c406855b420404 (diff)
downloadtotem-3d88aa1a7701fc47762ec11be30565b8b7c23f58.tar.gz
Mention the xine backend not requiring an exception (Closes: #525856)
2008-04-09 Bastien Nocera <hadess@hadess.net> * COPYING: Mention the xine backend not requiring an exception (Closes: #525856) svn path=/trunk/; revision=5354
-rw-r--r--COPYING3
-rw-r--r--ChangeLog5
2 files changed, 8 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index b7141f720..c2d6005b5 100644
--- a/COPYING
+++ b/COPYING
@@ -349,3 +349,6 @@ the GPL license 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.
+
+Note that the src/backend/bacon-video-widget-xine.c file does not require such
+an exception as it does not link to GStreamer plugins.
diff --git a/ChangeLog b/ChangeLog
index 961867bb9..9d5176648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-04-09 Bastien Nocera <hadess@hadess.net>
+ * COPYING: Mention the xine backend not requiring an exception
+ (Closes: #525856)
+
+2008-04-09 Bastien Nocera <hadess@hadess.net>
+
* src/bacon-message-connection.c:
* src/bacon-message-connection.h: Re-add exception lost in rev 2122
(Closes: #525856)