pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp		2015-12-20 22:56:33 +08:00
..
Classes	Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3	2015-12-20 22:56:33 +08:00
Resources	changeв russian letter с to english c	2015-12-18 10:19:08 +03:00
proj.android	Change the android test app to be landscape reversible.	2015-10-27 20:43:56 +09:00
proj.android-studio	Remove performance tests from cpp-tests project.	2015-09-10 16:01:56 +08:00
proj.ios	Improve error message for Downloader and add test case	2015-12-16 15:43:18 +08:00
proj.linux	…
proj.mac	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.win8.1-universal	updated winrt temporary app certificates expiration dates	2015-10-20 07:39:42 -07:00
proj.win10	moved file to correct folder in vcxproj	2015-10-20 10:07:30 -07:00
proj.win32	add a test case for pr 14327	2015-11-18 22:52:47 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	Remove performance tests from cpp-tests project.	2015-09-10 16:01:56 +08:00