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
..
lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-15 15:07:30 +08:00