Merge branch 'master' of https://github.com/supertuxkart/stk-code into ScriptEngine

src/io/file_manager.cpp

@@ -196,11 +196,8 @@ FileManager::FileManager()
     checkAndCreateCachedTexturesDir();
     checkAndCreateGPDir();
 
-#ifdef WIN32
     redirectOutput();
 
-#endif
-
     // We can't use _() here, since translations will only be initalised
     // after the filemanager (to get the path to the tranlsations from it)
     for(unsigned int i=0; i<m_root_dirs.size(); i++)

src/main.cpp

@@ -1183,11 +1183,6 @@ int main(int argc, char *argv[] )
 
         initRest();
 
-        // Windows 32 always redirects output
-#ifndef WIN32
-        file_manager->redirectOutput();
-#endif
-
         input_manager = new InputManager ();
 
 #ifdef ENABLE_WIIUSE

src/tracks/track.cpp

@@ -181,7 +181,7 @@ core::stringw Track::getName() const
     {
         translated = translated.subString(0, index);
     }
-        return translated;
+    return translated;
 }   // getName
 
 //-----------------------------------------------------------------------------