diff options
| author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:39:57 +0000 |
| commit | 1057d7190242cdf9248671b316a398db805f5f56 (patch) | |
| tree | ab50268a7db2f80cfb45a7ad6578fe735ab84ce5 /muse2/muse/gconfig.h | |
| parent | 9977c7114089b8708d310268833b83343caa0fd1 (diff) | |
| parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) | |
merged with trunk (that is, pulled the fixes from release_2_0)
only quickly tested, seems okay on the first glance
Diffstat (limited to 'muse2/muse/gconfig.h')
| -rw-r--r-- | muse2/muse/gconfig.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h index 24fd787a..f611687f 100644 --- a/muse2/muse/gconfig.h +++ b/muse2/muse/gconfig.h @@ -121,7 +121,7 @@ struct GlobalConfigValues { double minSlider; bool freewheelMode; int guiRefresh; - QString userInstrumentsDir; + QString userInstrumentsDir; // Obsolete. Must keep for compatibility. bool extendedMidi; // extended smf format int midiDivision; // division for smf export @@ -178,6 +178,8 @@ struct GlobalConfigValues { bool leftMouseButtonCanDecrease; bool rangeMarkerWithoutMMB; MusECore::newDrumRecordCondition_t newDrumRecordCondition; + bool addHiddenTracks; + bool unhideTracks; }; |