Merge branch 'KDE/4.11'

Conflicts: kwin/main.cpp
2013-09-26 07:54:51 +02:00 · 2013-09-26 07:54:51 +02:00 · e448a4bfc1
commit e448a4bfc1
parent 3594550b14 61f1bcc991
1 changed files with 1 additions and 1 deletions
--- a/main.cpp
+++ b/main.cpp
@ -409,7 +409,7 @@ KDE_EXPORT int kdemain(int argc, char * argv[])
        if (!multiHead.isEmpty()) {
            return (multiHead.toLower() == "true");
        }
-        return false;
+        return true;
    };
    if (number_of_screens != 1 && isMultiHead()) {
        KWin::is_multihead = true;