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/ui/console.c
+++ b/src/ui/console.c
@@ -50,7 +50,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "xmpp/xmpp.h"