summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING13
1 files changed, 6 insertions, 7 deletions
diff --git a/COPYING b/COPYING
index 3f38fa617..b34970309 100644
--- a/COPYING
+++ b/COPYING
@@ -342,13 +342,12 @@ 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 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 project hereby grants permission for non-GPL compatible GStreamer plugins
+to be used and distributed together with GStreamer and this project. This
+permission is above and beyond the permissions granted by the GPL license
+by which this project 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/totem-subtitle-encoding.c file was relicensed to LGPL
(see http://bugzilla.gnome.org/show_bug.cgi?id=515809).