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/widgets/musewidgetsplug.cpp | |
parent | b3280635650c81a718c1b93a2a3436d7bb35bab8 (diff) | |
parent | 12a05293d545375bfc68665f047bb5838ac212ef (diff) |
merged with trunk
Diffstat (limited to 'muse2/muse/widgets/musewidgetsplug.cpp')
-rw-r--r-- | muse2/muse/widgets/musewidgetsplug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp index 64189147..27e6d523 100644 --- a/muse2/muse/widgets/musewidgetsplug.cpp +++ b/muse2/muse/widgets/musewidgetsplug.cpp @@ -53,7 +53,7 @@ static const char* valu[] = { "C","C#","D","D#","E","F","F#","G","G#","A","A#","H" }; -GlobalConfigValues config = { +MusEGlobal::GlobalConfigValues config = { 190, // globalAlphaBlend { QColor(0xff, 0xff, 0xff), // palette |