samuele3hu 0daa30419b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp tools/tolua/cocos2dx.ini		2014-08-06 00:37:19 +08:00
..
project	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-06 00:37:19 +08:00
res	Add Lua bindings for controller and related test case project	2014-07-09 18:05:02 +08:00
src	Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates	2014-08-04 17:11:57 +08:00
.cocos-project.json	Update controller lua binding and related test cases	2014-07-11 11:52:05 +08:00