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
..
project	add regular support in Node::enumerateChildren()	2014-07-02 17:07:36 +08:00
res/cocosbuilderRes	Re-adds resources in cpp-tests and lua-tests, but removes some large	2014-05-05 13:27:47 +08:00
src	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer	2014-07-08 14:57:19 +08:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00