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
..
Classes	Split module for Linux on Lua and adjust related test cases	2014-08-06 00:15:44 +08:00
proj.android	Add module Android.mk config and adjust related test cases	2014-08-05 13:29:54 +08:00
proj.ios_mac	GLView Hook	2014-07-31 00:53:04 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.win32	Split module for win32 and adjust related test cases	2014-08-05 19:46:13 +08:00
CMakeLists.txt	Split module for Linux on Lua and adjust related test cases	2014-08-06 00:15:44 +08:00