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
This commit is contained in:
@@ -24,6 +24,8 @@
|
||||
#include "table/strings.h"
|
||||
#include "table/palettes.h"
|
||||
|
||||
#include "safeguards.h"
|
||||
|
||||
static const char *UPARROW = "\xEE\x8A\xA0"; ///< String containing an upwards pointing arrow.
|
||||
static const char *DOWNARROW = "\xEE\x8A\xAA"; ///< String containing a downwards pointing arrow.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user