Merge branch 'master' into openpgp

Conflicts: .travis.yml
2015-06-05 23:02:56 +01:00
parent a3693cfbe7 ae4e07ad87
commit 9aff8abd2e
82 changed files with 968 additions and 53 deletions
--- a/src/ui/windows.h
+++ b/src/ui/windows.h
@@ -35,6 +35,8 @@
 #ifndef UI_WINDOWS_H
 #define UI_WINDOWS_H

+#include "ui/window.h"
+
 void wins_init(void);

 ProfWin * wins_new_xmlconsole(void);