Merged minetest-delta a624fe549bc75855a170

diff --cc src/client.cpp
Simple merge

diff --cc src/main.cpp
index b6a53566e3f92e39fee6418bf810475916d4c049,698c5fc712d416b8c1317d80ba84561e98118243..3edf79bd2c08b0622af757180b32a736ea3be54a
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -1350,9 -1345,6 +1351,9 @@@ int main(int argc, char *argv[]
        \r
        // Set device in game parameters\r
        device = device;\r
- 
-       // Set the window caption
-       device->setWindowCaption(L"Minetest [Main Menu]");
++\r
++      // Set the window caption\r
++      device->setWindowCaption(L"Minetest [Main Menu]");\r
        \r
        // Create time getter\r
        g_timegetter = new IrrlichtTimeGetter(device);\r