summaryrefslogtreecommitdiff
path: root/muse2/muse/gconfig.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-11 13:30:53 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-11 13:30:53 +0000
commit872bace8291a63849ce690100eec7042bf8e05b6 (patch)
tree55030d6a8bb4733e8656c53e7f236cf6e0c14eb5 /muse2/muse/gconfig.cpp
parentb3280635650c81a718c1b93a2a3436d7bb35bab8 (diff)
parent12a05293d545375bfc68665f047bb5838ac212ef (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/gconfig.cpp')
-rw-r--r--muse2/muse/gconfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index df8742e8..a19d9ed8 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -25,7 +25,7 @@
namespace MusEGlobal {
-MusEGui::GlobalConfigValues config = {
+GlobalConfigValues config = {
190, // globalAlphaBlend
{
QColor(0xff, 0xff, 0xff), // palette