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	fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings	2014-03-20 10:14:25 +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