Vladimir Timofeev a689fc4c7e sync with upstream ... Conflicts: CMakeLists.txt		2014-11-20 12:19:00 +03:00
..
project	Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.	2014-11-19 03:28:41 +03:00
res/cocosbuilderRes	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
src	Add test case for value type judge error	2014-11-13 15:36:43 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00