Vladimir Timofeev a689fc4c7e sync with upstream ... Conflicts: CMakeLists.txt		2014-11-20 12:19:00 +03:00
..
project	mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)	2014-11-17 01:42:04 +03:00
res	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
src	Update the Xcode project setting for related test cases	2014-10-15 11:18:22 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00