diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-11 13:30:53 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-11 13:30:53 +0000 |
| commit | 872bace8291a63849ce690100eec7042bf8e05b6 (patch) | |
| tree | 55030d6a8bb4733e8656c53e7f236cf6e0c14eb5 /muse2/muse/gconfig.h | |
| parent | b3280635650c81a718c1b93a2a3436d7bb35bab8 (diff) | |
| parent | 12a05293d545375bfc68665f047bb5838ac212ef (diff) | |
merged with trunk
Diffstat (limited to 'muse2/muse/gconfig.h')
| -rw-r--r-- | muse2/muse/gconfig.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h index 85eecf60..24fd787a 100644 --- a/muse2/muse/gconfig.h +++ b/muse2/muse/gconfig.h @@ -45,7 +45,7 @@ enum newDrumRecordCondition_t } -namespace MusEGui { +namespace MusEGlobal { //--------------------------------------------------------- // MixerConfig @@ -180,10 +180,10 @@ struct GlobalConfigValues { MusECore::newDrumRecordCondition_t newDrumRecordCondition; }; -} // namespace MusEGui -namespace MusEGlobal { -extern MusEGui::GlobalConfigValues config; + + +extern GlobalConfigValues config; } // namespace MusEGlobal #endif |