samuele3hu 8d9064b4e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test ... Conflicts: tests/cpp-tests/Classes/AppDelegate.cpp		2015-04-22 10:31:39 +08:00
..
cpp-empty-test	removed CC_PLATFORM_WINRT messagebox code	2015-04-20 10:32:11 -07:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test	2015-04-22 10:31:39 +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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test	2015-04-22 10:31:39 +08:00