rhythmbox r5919 - trunk

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun Sep 14 00:16:48 2008
New Revision: 5919
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5919&view=rev

Log:
2008-09-14  Jonathan Matthew  <jonathan d14n org>

	* COPYING:  Add the GPL exception.  Fixes #551868.


Modified:
   trunk/COPYING
   trunk/ChangeLog

Modified: trunk/COPYING
==============================================================================
--- trunk/COPYING	(original)
+++ trunk/COPYING	Sun Sep 14 00:16:48 2008
@@ -1,3 +1,6 @@
+# This GPL license have a exception clause added, see at the bottom of file
+# for details.
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -338,3 +341,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 Rhythmbox authors hereby grant permission for non-GPL compatible
+GStreamer plugins to be used and distributed together with GStreamer and
+Rhythmbox. This permission is above and beyond the permissions granted by
+the GPL license by which Rhythmbox 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.
+