XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim ... Conflicts: cocos/scripting/js-bindings/manual/js_manual_conversions.h		2015-12-01 15:12:32 +08:00
..
auto	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-11-27 09:41:59 +00:00
manual	add missing return type	2015-11-26 17:33:45 +08:00
proj.android	Fix lua project	2015-09-26 19:43:36 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Disable bitcode for all targets	2015-10-22 12:18:51 +08:00
proj.win32	Combine studio change for LuaBinding, jsb and simulator	2015-11-25 21:52:44 +08:00
script	lua add UPDATE_FAILED ERROR_DECOMPRESS	2015-09-02 11:27:47 +08:00
CMakeLists.txt	Fix lua project	2015-09-26 19:43:36 +08:00