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-template-default	add missed external module for cocos console on linux	2014-10-13 16:52:14 +08:00
lua-template-default	Merge pull request #8683 from dualface/update_lua_template_runtime	2014-10-14 17:01:19 +08:00
lua-template-runtime	Windows runtime response uncorrect	2014-10-15 00:20:18 +08:00
cocos2dx_files.json	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-15 15:07:30 +08:00