# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1262993624 0
# Node ID 090e141a52141e90d9d85376a3ed5ac2c41b895e
# Parent  d4ec9ba828149c2e6136ade20d62f6bfd563c64e
Some merge-resolving...

diff -r d4ec9ba82814 -r 090e141a5214 libpurple/protocols/jabber/jingle/jingle.c
--- 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)