Merge from branch 3.0

2011-03-19 00:02:29 +01:00
parent 910bcc688c
commit f9d74687b9
20 changed files with 1873 additions and 1586 deletions
--- a/rtgui/splash.cc
+++ b/rtgui/splash.cc
@@ -18,6 +18,7 @@
 */
 #include <splash.h>
 #include <multilangmgr.h>
+#include <glib/gstdio.h>
 #include <safegtk.h>

 extern Glib::ustring argv0;