# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242779952 0
# Node ID a6a4b440e5aed27dbb98c0ab4f8c63edbf706adf
# Parent  65fadd6977b454b80789c6d99c364f92cec4b04b# Parent  6b0e150f2276e1aa208e41fc829c285066a1a57e
merge of '53630753bb021f7391e8ad30abd709f73fe47c3d'
     and '90901b2c41b0b1a7856d9fb15fb2eb3b67383423'

diff -r 6b0e150f2276 -r a6a4b440e5ae libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h	Wed May 20 00:34:59 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Wed May 20 00:39:12 2009 +0000
@@ -75,7 +75,7 @@
 /* Index into attention_types list */
 #define JABBER_BUZZ 0
 
-PurplePlugin *jabber_plugin;
+extern PurplePlugin *jabber_plugin;
 
 typedef enum {
 	JABBER_STREAM_OFFLINE,