Merge branch 'master' of https://github.com/okamstudio/godot

2014-02-19 12:01:31 -03:00
parent d7d65fa2f2 2bfbf89781
commit 449bc14fb4
8 changed files with 26 additions and 1941 deletions
--- a/main/main.cpp
+++ b/main/main.cpp
@ -202,7 +202,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 	
 	for(int i=0;i<argc;i++) {

-		args.push_back(argv[i]);	
+		args.push_back(String::utf8(argv[i]));
 	}

 	List<String>::Element *I=args.front();