axmol/cocos/scripting/lua-bindings
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
2014-07-11 16:44:59 +08:00
..
auto [AUTO]: updating luabinding automatically 2014-07-11 05:46:37 +00:00
manual Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-11 16:44:59 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj Add Lua bindings for controller and related test case project 2014-07-09 18:05:02 +08:00
proj.win32 Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
script Add newline for some files 2014-07-11 12:00:43 +08:00
Android.mk Add Lua bindings for controller and related test case project 2014-07-09 18:05:02 +08:00
CMakeLists.txt Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00