summaryrefslogtreecommitdiff
path: root/muse2/muse/conf.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-11 11:11:08 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-11 11:11:08 +0000
commit12a05293d545375bfc68665f047bb5838ac212ef (patch)
tree7c89d648418fd14bacf9cb5eb2ad441acd92e20a /muse2/muse/conf.cpp
parent62cbe31ce1e2252787556f4a00c003214ed83777 (diff)
moved GlobalConfigValues and MixerConfig from MusEGui into MusEGlobal
namespace
Diffstat (limited to 'muse2/muse/conf.cpp')
-rw-r--r--muse2/muse/conf.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index c4df1f36..c11adf7b 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -1637,6 +1637,10 @@ void MidiFileConfig::cancelClicked()
close();
}
+} // namespace MusEGui
+
+
+namespace MusEGlobal {
//---------------------------------------------------------
// write
@@ -1722,5 +1726,5 @@ void MixerConfig::read(MusECore::Xml& xml)
}
-} // namespace MusEGui
+} // namespace MusEGlobal