axmol/cocos/scripting/lua-bindings
samuele3hu b3da322920 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
2014-06-26 16:21:09 +08:00
..
auto Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-06-26 16:21:09 +08:00
manual Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-06-26 16:21:09 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj Add VideoPlayer Lua bindings and update bindings-generator submodule 2014-06-26 16:19:22 +08:00
proj.win32 Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
script Add deprecated support for lua binding of `getSize` and `setSize` of Widget 2014-06-25 15:13:08 +08:00
Android.mk Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
CMakeLists.txt Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00