diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-10-09 12:17:48 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-10-09 12:17:48 +0300 |
| commit | 835ee148e5f252fd90823abb25dd3b9eb79b2999 (patch) | |
| tree | 1f5126b73fe8502a71e268e4d4d3a0a27f946a36 /src/slic3r/GUI/GUI_ObjectList.hpp | |
| parent | 59a6318931ca36781e57d3c3687665967fdb3526 (diff) | |
| parent | 2dc9949a4c129a448d0a5881ac2d2d165e2fea4c (diff) | |
Fixed conflicts after merging with master
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectList.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 87be25ed9..0874343b6 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -237,7 +237,8 @@ public: wxMenuItem* append_menu_item_printable(wxMenu* menu, wxWindow* parent); void append_menu_items_osx(wxMenu* menu); wxMenuItem* append_menu_item_fix_through_netfabb(wxMenu* menu); - void append_menu_item_export_stl(wxMenu* menu) const ; + void append_menu_item_export_stl(wxMenu* menu) const; + void append_menu_item_reload_from_disk(wxMenu* menu) const; void append_menu_item_change_extruder(wxMenu* menu) const; void append_menu_item_delete(wxMenu* menu); void append_menu_item_scale_selection_to_fit_print_volume(wxMenu* menu); |