Merge branch 'master' into openpgp

2015-06-15 20:39:17 +01:00
parent b52de6869a 5cdd69f478
commit c76692516a
28 changed files with 313 additions and 276 deletions
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -65,7 +65,7 @@
 #include "resource.h"
 #include "xmpp/xmpp.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "event/client_events.h"

 static void _check_autoaway(void);