Merge branch 'master' into wipe_tower_improvements

This commit is contained in:
Lukas Matena 2018-04-06 12:33:12 +02:00
commit 7253028d79
38 changed files with 2021 additions and 233 deletions

View file

@ -81,6 +81,7 @@ void set_preset_bundle(PresetBundle *preset_bundle);
AppConfig* get_app_config();
wxApp* get_app();
wxColour* get_modified_label_clr();
wxColour* get_sys_label_clr();
void add_debug_menu(wxMenuBar *menu, int event_language_change);