pulled fixes from release into trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index d9038ea1..95b88170 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -109,7 +109,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
@@ -164,6 +164,9 @@ struct GlobalConfigValues {
       bool popupsDefaultStayOpen;
       bool leftMouseButtonCanDecrease;
       bool rangeMarkerWithoutMMB;
+      bool addHiddenTracks;
+      bool unhideTracks;
+
       };