diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
| commit | a347445db32f51562aee5c6a786c312d1f612d2f (patch) | |
| tree | ba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/muse/gconfig.cpp | |
| parent | 375d6a53630f364c6560eb40255a8cc4c0496b8c (diff) | |
| parent | 5367067f7a36dce8a362dcc000d41ac581bffdfe (diff) | |
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/muse/gconfig.cpp')
| -rw-r--r-- | muse2/muse/gconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index f8334b1e..65397fe4 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -23,9 +23,9 @@ #include "gconfig.h" -namespace MusEConfig { +namespace MusEGlobal { -GlobalConfigValues config = { +MusEGui::GlobalConfigValues config = { 190, // globalAlphaBlend { QColor(0xff, 0xff, 0xff), // palette @@ -192,4 +192,4 @@ GlobalConfigValues config = { false // rangeMarkerWithoutMMB }; -} // namespace MusEConfig +} // namespace MusEGlobal |