samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer ... Conflicts: tests/lua-tests/src/mainMenu.lua tools/bindings-generator tools/tolua/cocos2dx_physics.ini		2014-07-08 14:57:19 +08:00
..
xcshareddata/xcschemes	issue #4895:Add test case[ios]	2014-06-30 12:53:26 +08:00
project.pbxproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer	2014-07-08 14:57:19 +08:00