samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-10-16 16:04:09 +08:00
..
auto	Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine	2014-10-16 16:04:09 +08:00
manual	Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine	2014-10-16 16:04:09 +08:00
proj.android	Update Android.mk for libluacocos2d	2014-10-15 00:25:12 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	Update CSLoader lua-bindings and adjust project config	2014-10-14 23:37:00 +08:00
proj.win32	Update win32 project config	2014-10-15 00:08:52 +08:00
script	Update the related AssetsManagerEx files and related project configure	2014-10-16 10:28:52 +08:00
CMakeLists.txt	Update CSLoader lua-bindings and adjust project config	2014-10-14 23:37:00 +08:00