Merge branch 'master' into pgp

2015-04-19 16:56:11 +01:00
parent bcfbbac49a 424f52c3fa
commit 60f94722d4
10 changed files with 10 additions and 10 deletions
--- a/tests/test_server_events.c
+++ b/tests/test_server_events.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <glib.h>

-#include "server_events.h"
+#include "event/server_events.h"
 #include "roster_list.h"
 #include "chat_session.h"
 #include "config/preferences.h"