changeset 30518:090e141a5214

Some merge-resolving...
author Marcus Lundblad <ml@update.uu.se>
date Fri, 08 Jan 2010 23:33:44 +0000
parents d4ec9ba82814
children d873eeaccfc2
files libpurple/protocols/jabber/jingle/jingle.c
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/jingle.c	Thu Dec 10 21:36:41 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Fri Jan 08 23:33:44 2010 +0000
@@ -29,16 +29,12 @@
 #include "content.h"
 #include "debug.h"
 #include "jingle.h"
-#include <string.h>
 #include "session.h"
 #include "iceudp.h"
 #include "rawudp.h"
 #include "rtp.h"
 
-#ifdef USE_VV
-#include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-element-added-notifier.h>
-#endif
+#include <string.h>
 
 GType
 jingle_get_type(const gchar *type)