aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2009-11-19 23:00:56 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2009-11-19 23:00:56 +0000
commitc289b6f820ea8006d84b3de13c9052dcb99ec99c (patch)
tree2d73ec2b0ed08621e9a094d136a13fab7d3d8410 /protocols/jabber
parentc48a033d62bb5c5188a876b182d50144ffaed68b (diff)
parent36cf9fda6a5cc4bcbfe98319b48af636fa142590 (diff)
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.
Diffstat (limited to 'protocols/jabber')
-rw-r--r--protocols/jabber/jabber.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h
index ee453144..1180d2b9 100644
--- a/protocols/jabber/jabber.h
+++ b/protocols/jabber/jabber.h
@@ -26,8 +26,9 @@
#include <glib.h>
-#include "xmltree.h"
#include "bitlbee.h"
+#include "md5.h"
+#include "xmltree.h"
extern GSList *jabber_connections;