samuele3hu 70dec15e76 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix		2014-04-10 23:38:57 +08:00
..
auto	[AUTO]: updating luabinding automatically	2014-04-10 08:20:27 +00:00
manual	fix the crash invoked by deprecated `create` function of `Label`	2014-04-10 23:36:25 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj	issue #4729: iOS/Mac works fine	2014-04-10 00:36:41 +08:00
proj.win32	close #4400: Use the newest version of LuaSocket for lua	2014-03-20 17:04:54 +08:00
script	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
Android.mk	close #4400: Update the anrroid.mk for lua-bindings	2014-03-20 18:09:52 +08:00
CMakeLists.txt	fix lua bindings	2014-03-11 21:36:00 +08:00