Merge remote-tracking branch 'upstream/master'

Conflicts: src/console_gui.cpp src/genworld_gui.cpp src/group_gui.cpp src/misc_gui.cpp src/settings_gui.cpp src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
parent 19472fd0d2 bb3544e086
commit 91ebce1a9c
550 changed files with 7396 additions and 6552 deletions
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -40,6 +40,8 @@

 #include "widgets/rail_widget.h"

+#include "safeguards.h"
+

 static RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.
 static bool _remove_button_clicked;          ///< Flag whether 'remove' toggle-button is currently enabled