Merge branch 'master' into wdk

2012-01-08 23:57:46 +01:00
parent 18404054b0 bca7e6c554
commit 34dace46af
5 changed files with 5 additions and 9 deletions
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include "xchat.h"
 #include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
 #include <ctype.h>
 #include "util.h"
 #include "../../config.h"