tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain ... Resovle Conflicts: cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters		2015-04-03 15:45:51 +08:00
..
cpp-empty-test	Support compile & run test projects with cocos2d-console on wp8.	2015-03-25 11:42:55 +08:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain	2015-04-03 15:45:51 +08:00
game-controller-test	Fixed game controller test can't compile by cocos command	2015-01-28 17:37:31 +08:00
lua-empty-test	Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.	2015-02-10 16:23:34 +03:00
lua-game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-tests	Update Sprite3DCubeMap test case	2015-03-28 14:59:47 +08:00