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
History
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 		2013-11-01 17:17:21 +08:00
..
bindings Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-01 17:17:21 +08:00
script Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-01 17:17:21 +08:00