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/viewport.cpp
+++ b/src/viewport.cpp
@@ -51,6 +51,8 @@
 #include "table/strings.h"
 #include "table/palettes.h"

+#include "safeguards.h"
+
 Point _tile_fract_coords;

 struct StringSpriteToDraw {