Merge remote-tracking branch 'origin/master' into new_main_page_ui

This commit is contained in:
YuSanka 2018-05-22 09:05:34 +02:00
commit 2a8391dfbf
463 changed files with 186134 additions and 380 deletions

View file

@ -312,6 +312,7 @@ public:
//Slic3r::GUI::Tab::Printer;
class TabPrinter : public Tab
{
bool m_has_single_extruder_MM_page = false;
public:
wxButton* m_serial_test_btn;
wxButton* m_octoprint_host_test_btn;