Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 

Conflicts:
	tools/bindings-generator
This commit is contained in:
chuanweizhang 2013-12-26 16:46:55 +08:00
parent be9e384fa0 9d4a84c40c
commit 7d7a0866e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/auto-generated

@ -1 +1 @@
Subproject commit afd23aedea6035df78b877da9f6b672c0a0fe346
Subproject commit 2f60892e1053a2e7dabfbab9da1058063475eb97