cpw.malu.xmpp.google_relay: ceed48b0: Some merge-resolving...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: ceed48b0e66b4c3d505f6403da76076d6ee203a5
Ancestor: 6d5f3264173d13362030c57e5372ffbbfbdef53d
Author: malu at pidgin.im
Date: 2010-01-08T23:33:44
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/ceed48b0e66b4c3d505f6403da76076d6ee203a5

Modified files:
        libpurple/protocols/jabber/jingle/jingle.c

ChangeLog: 

Some merge-resolving...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/jingle.c	321091d6d322703af6a35a39eecebbe0b7f9e6d4
+++ libpurple/protocols/jabber/jingle/jingle.c	3d2ca6e6b6d525a15e1763427ad7395bcc0d543e
@@ -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)