axmol/cocos/scripting/lua-bindings
samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
2014-07-10 22:42:09 +08:00
..
auto [AUTO]: updating luabinding automatically 2014-07-10 02:03:40 +00:00
manual Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 2014-07-10 22:42:09 +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 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 2014-07-10 22:42:09 +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