aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-05-24 00:53:22 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-05-24 00:53:22 +0800
commit14996cd9a0545230d4cd35b85d15a40521c24d19 (patch)
tree42a8c12751941ff3dba03ea25e5910f65f511301
parent914908699dce39e6f3e570a75c9a314b4f0c498d (diff)
downloadgsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar.gz
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar.bz2
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar.lz
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar.xz
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.tar.zst
gsoc2013-empathy-14996cd9a0545230d4cd35b85d15a40521c24d19.zip
Update BaconMessageConnection from libbacon SVN
svn path=/trunk/; revision=1123
-rw-r--r--src/bacon-message-connection.c8
-rw-r--r--src/bacon-message-connection.h8
2 files changed, 16 insertions, 0 deletions
diff --git a/src/bacon-message-connection.c b/src/bacon-message-connection.c
index c8000de24..c755cd5d2 100644
--- a/src/bacon-message-connection.c
+++ b/src/bacon-message-connection.c
@@ -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>
diff --git a/src/bacon-message-connection.h b/src/bacon-message-connection.h
index aac7a2d11..db4a91262 100644
--- a/src/bacon-message-connection.h
+++ b/src/bacon-message-connection.h
@@ -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