brasero r1773 - in trunk: . libbrasero-media

[philippr svn gnome org]

Author: philippr
Date: Sat Jan 17 19:50:39 2009
New Revision: 1773
URL: http://svn.gnome.org/viewvc/brasero?rev=1773&view=rev

Log:
2009-01-17  Philippe Rouquier  <bonfire-app wanadoo fr>

	Relicenced to GPL 2 + restrictions on behalf of its author 

	* libbrasero-media/scsi-cam.c:


Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/scsi-cam.c

Modified: trunk/libbrasero-media/scsi-cam.c
==============================================================================
--- trunk/libbrasero-media/scsi-cam.c	(original)
+++ trunk/libbrasero-media/scsi-cam.c	Sat Jan 17 19:50:39 2009
@@ -7,19 +7,31 @@
  ****************************************************************************/
 
 /*
+ * Copyright (C) Joe Marcus Clarke 2008 <marcus FreeBSD org>
+ *
  * Brasero is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ * The Brasero authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Brasero. This permission is above and beyond the permissions granted
+ * by the GPL license by which Brasero 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.
+ * 
  * Brasero is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with this program; if not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H