Merge branch 'master' into chart-db

Conflicts: src/ag-chart.h src/ag-window.c Conflicts fixed without problems.
2014-08-01 18:03:27 +02:00
parent c79e24c709 c22fc02a2a
commit d30b31ce7e
2 changed files with 3 additions and 2 deletions
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -5,6 +5,7 @@
 #include <libxml/tree.h>
 #include <webkit2/webkit2.h>
 #include <libgd/gd-main-view.h>
+#include <gtk/gtk.h>

 #include <swe-glib.h>