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 developEventTrigger

This commit is contained in:
samuele3hu 2014-02-19 16:57:18 +08:00
parent d7b0efd6d7 557fbe43da
commit e1387f40eb
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 9048d215bef749e5084ef3c6441627299d3e9750
Subproject commit 8c8ddeab158e65016e215131032a5e86dc7d93b5