summaryrefslogtreecommitdiff
path: root/license_change
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-05-03 22:32:25 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-05-03 22:32:25 +0000
commited30cf5cf10da892f622d47dbd13a3401681dc47 (patch)
treee61183dcb93f0b65a2b92ad5f569cb74e01678f4 /license_change
parenta465885ca06881249d590e0ecbd0073b6790e786 (diff)
downloadtotem-ed30cf5cf10da892f622d47dbd13a3401681dc47.tar.gz
Fix excemption/exemption/exception usage Add exception clauses to
2007-05-03 Bastien Nocera <hadess@hadess.net> * license_change: * src/backend/bacon-video-widget-common.c: * src/backend/bacon-video-widget-common.h: * src/backend/bacon-video-widget-gst-0.10.c: * src/backend/bacon-video-widget.h: * src/ev-sidebar.c: * src/ev-sidebar.h: * src/plugins/galago/totem-galago.c: * src/plugins/gromit/totem-gromit.c: * src/plugins/lirc/totem-lirc.c: * src/plugins/media-player-keys/totem-media-player-keys.c: * src/plugins/ontop/totem-ontop.c: * src/plugins/screensaver/totem-screensaver.c: * src/plugins/sidebar-test/totem-sidebar-test.c: * src/test-properties-page.c: * src/totem-interface.c: * src/totem-object.c: * src/totem-preferences.c: * src/totem-preferences.h: * src/totem-private.h: * src/totem-properties-main.c: * src/totem-properties-view.c: * src/totem-properties-view.h: * src/totem-subtitle-encoding.c: * src/totem-video-indexer.c: * src/totem.c: * src/totem.h: Fix excemption/exemption/exception usage Add exception clauses to ev-sidebar.[ch], thanks to the copyright holders for agreeing to the relicensing (Closes: #433115) svn path=/trunk/; revision=4281
Diffstat (limited to 'license_change')
-rw-r--r--license_change28
1 files changed, 23 insertions, 5 deletions
diff --git a/license_change b/license_change
index aec4990f6..52da4f554 100644
--- a/license_change
+++ b/license_change
@@ -1,10 +1,15 @@
Christian Schaller: Monday 7th February 2005
-- Added following excemption clause to all GPL files:
+- Added following exception clause to all GPL files:
-"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 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.
+"
This was done with the permission of all copyright holders as listed below:
@@ -26,3 +31,16 @@ Luca Ferretti <elle.uca@libero.it>
Anders Carlsson <andersca@gnome.org>
James Willcox <jwillcox@gnome.org>
Colin Walters <walters@verbum.org>
+
+Bastien Nocera: Thursday 3rd May 2007
+- Added exception clause to ev-sidebar.[ch]
+(Note that all copyright holders also agreed to relicensing that same code
+under the LGPL for inclusion in GTK+
+See http://bugzilla.gnome.org/show_bug.cgi?id=307044)
+
+This was done with the permission of all copyright holders as listed below:
+Marco Pesenti Gritti <mpg@redhat.com>
+Jonathan Blandford <jrb@redhat.com>
+Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+Carlos Garcia Campos <carlosgc@gnome.org>
+