Merge branch 'master' into developer

Conflicts: source/config.c
2016-08-15 21:29:17 +02:00 · 2016-08-15 21:29:17 +02:00 · e4c87a59d0
commit e4c87a59d0
parent 76411387ba eef30ceb3c
1 changed files with 2 additions and 2 deletions
--- a/source/config.c
+++ b/source/config.c
@ -53,7 +53,7 @@ void configureCFW(const char *configPath)
        int posY;
        u32 enabled;
    } multiOptions[] = {
-        { .posXs = {26, 31, 36, 41} },
+        { .posXs = {26, 32, 38, 44} },
        { .posXs = {17, 26, 32, 44} },
        { .posXs = {20, 31, 43, 0} }
    };