Changeset c289b6f for protocols/jabber/jabber.h

Timestamp:

2009-11-19T23:00:56Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5e795d

Parents:

c48a033 (diff), 36cf9fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in head. I want to roll a 1.2.4-2 that fixes the libresolv issues.
Having the include files fixed is a nice extra.

File:

• protocols/jabber/jabber.h (modified) (1 diff)

protocols/jabber/jabber.h

@@ -27 +27 @@
 #include <glib.h>
 
+#include "bitlbee.h"
+#include "md5.h"
 #include "xmltree.h"
-#include "bitlbee.h"
 
 extern GSList *jabber_connections;