summaryrefslogtreecommitdiff
path: root/muse2/muse/app.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-23 18:25:40 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-23 18:25:40 +0000
commita16b4e2746309724086f55d7df8b15da40939b20 (patch)
tree0380e5724d80c6ac91bd448868525d372de60e2b /muse2/muse/app.h
parent7caa48f2561ae838049abb64adffe8ce43185b34 (diff)
parentb5bdb59699abd38a3aa90dfb4d9882b2be7f5be0 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/app.h')
-rw-r--r--muse2/muse/app.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/muse2/muse/app.h b/muse2/muse/app.h
index 70aac8fc..2aa2834f 100644
--- a/muse2/muse/app.h
+++ b/muse2/muse/app.h
@@ -286,7 +286,7 @@ class MusE : public QMainWindow
void startMidiTransformer();
void writeGlobalConfiguration() const;
- void startEditInstrument();
+ //void startEditInstrument();
void startClipList(bool);
void openRecentMenu();
@@ -357,6 +357,7 @@ class MusE : public QMainWindow
void importMidi(const QString &file);
void setUsedTool(int);
void showDidYouKnowDialog();
+ void startEditInstrument();
void routingPopupMenuAboutToHide();
void configMidiPorts();