empathy r1123 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri May 23 16:53:22 2008
New Revision: 1123
URL: http://svn.gnome.org/viewvc/empathy?rev=1123&view=rev

Log:
Update BaconMessageConnection from libbacon SVN


Modified:
   trunk/src/bacon-message-connection.c
   trunk/src/bacon-message-connection.h

Modified: trunk/src/bacon-message-connection.c
==============================================================================
--- trunk/src/bacon-message-connection.c	(original)
+++ trunk/src/bacon-message-connection.c	Fri May 23 16:53:22 2008
@@ -15,6 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * 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.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * See license_change file for details.
+ *
  */
 
 #include <sys/types.h>

Modified: trunk/src/bacon-message-connection.h
==============================================================================
--- trunk/src/bacon-message-connection.h	(original)
+++ trunk/src/bacon-message-connection.h	Fri May 23 16:53:22 2008
@@ -15,6 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * 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.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * See license_change file for details.
+ *
  */
 
 #ifndef BACON_MESSAGE_CONNECTION_H