GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 05:15:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge correction

Browse Source
This commit is contained in:
Lukas Matena 2018-04-04 14:41:23 +02:00
parent eb9917536c
commit 290e3e66c0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xs/src/slic3r/GUI/GUI.cpp
View File

@ -716,8 +716,10 @@ ConfigOptionsGroup* get_optgroup()
} }
wxButton* get_wiping_dialog_button(){ wxButton* get_wiping_dialog_button()
{
return g_wiping_dialog_button; return g_wiping_dialog_button;
}
wxWindow* export_option_creator(wxWindow* parent) wxWindow* export_option_creator(wxWindow* parent)
{ {
@ -762,6 +764,9 @@ int get_export_option(wxFileDialog* dlg)
} }
return 0; return 0;
} }
} }
} // namespace GUI
} // namespace Slic3r