samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d ... Conflicts: templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h tests/lua-tests/src/mainMenu.lua		2015-05-24 22:46:05 +08:00
..
project	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d	2015-05-24 22:46:05 +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_physics3d	2015-05-24 22:46:05 +08:00
.cocos-project.json	Remove vs2012 support in v3	2015-05-05 16:11:26 +08:00