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
..
Classes	Modify Xcode project’s configure	2014-10-15 14:32:11 +08:00
proj.android	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
proj.ios_mac	Platform fixed	2014-09-09 16:50:02 -07:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.win32	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-15 15:07:30 +08:00
CMakeLists.txt	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