merged with trunk

1 files changed, 3 insertions, 1 deletions

diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 835ca879..faff69e2 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -85,10 +85,12 @@ class MasterEdit : public MidiEditor {
       void posChanged(int,unsigned,bool);
       void setTime(unsigned);
       void setTempo(int);
+      void sigChange(const AL::TimeSignature&);
+      void tempoChange(double);
+      void focusCanvas();
 
    public slots:
       void songChanged(int);
-//      void tempoChanged(double);
 
    signals:
       void isDeleting(MusEGui::TopWin*);