3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'profile_changes_reset' into updating

Browse source
This commit is contained in:
Vojtech Kral 2018-04-24 18:15:23 +02:00
commit 62d67d35ec
28 changed files with 803 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xs/src/slic3r/GUI/GUI.hpp
View file

@ -86,6 +86,7 @@ PresetBundle* get_preset_bundle();
const wxColour& get_modified_label_clr();
const wxColour& get_sys_label_clr();
const wxColour& get_default_label_clr();
unsigned get_colour_approx_luma(const wxColour &colour);
extern void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_language_change);