XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d ... Conflicts: cocos/scripting/lua-bindings/manual/LuaBasicConversions.h		2015-12-02 15:07:58 +08:00
..
Classes	make sure attributes greater than 8 before use normal map	2015-12-02 12:03:31 +08:00
Resources	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d	2015-12-02 15:07:58 +08: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	Squashed commit of the following:	2015-08-13 00:14:10 -07: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