Merge branch 'master' into gizmos

2020-05-02 17:06:49 +10:00
parent 1cca9de7c5 90597bd08a
commit cfc5ce24a3
130 changed files with 2310 additions and 981 deletions
@@ -62,12 +62,6 @@ public slots:
 protected:
  void CreateScopePanel(ScopePanel::Type type);

-private:
-  int scope_panel_count_;
-
-private slots:
-  void ScopePanelClosed();
-
 };

 OLIVE_NAMESPACE_EXIT