samuele3hu 6c79ce50d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua tests/lua-tests/src/mainMenu.lua		2014-10-15 15:07:30 +08:00
..
cpp-empty-test	1. fix git error	2014-10-12 17:51:34 +08:00
cpp-tests	Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager	2014-10-15 13:41:27 +08:00
game-controller-test	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
lua-empty-test	Update the Xcode project setting for related test cases	2014-10-15 11:18:22 +08:00
lua-game-controller-test	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
lua-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-15 15:07:30 +08:00