Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/lua-bindings
History
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 		2014-12-22 11:14:31 +08:00
..
auto [AUTO]: updating luabinding automatically 2014-12-17 10:38:03 +00:00
manual Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-22 11:14:31 +08:00
proj.android Resolve the project setting error on the platforms 2014-11-27 19:42:32 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
proj.win32 Resolve the project setting error on the platforms 2014-11-27 19:42:32 +08:00
script Synchronize the KeyCode Enum to Lua 2014-12-17 11:27:01 +08:00
CMakeLists.txt Resolve the project setting error on the platforms 2014-11-27 19:42:32 +08:00