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

This commit is contained in:
YuSanka 2019-06-05 11:16:25 +02:00
commit 4b3df010ab
35 changed files with 4368 additions and 3851 deletions

View file

@ -167,6 +167,7 @@ public:
wxNotebook* tab_panel() const ;
int extruders_cnt() const;
int extruders_edited_cnt() const;
std::vector<Tab *> tabs_list;