merged with trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 33491581..907b8b84 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -122,7 +122,6 @@ class DrumEdit : public MidiEditor {
    private slots:
       void setRaster(int);
       void noteinfoChanged(MusEGui::NoteInfo::ValType type, int val);
-      //CtrlEdit* addCtrl();
       void removeCtrl(CtrlEdit* ctrl);
       void cmd(int);
       void clipboardChanged(); // enable/disable "Paste"
@@ -144,6 +143,7 @@ class DrumEdit : public MidiEditor {
       void hideEmptyInstruments();
       
       void display_old_new_conflict_message();
+      void focusCanvas();
 
    public slots:
       void setSelection(int, MusECore::Event&, MusECore::Part*);