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 TableView

This commit is contained in:
samuele3hu 2013-09-04 22:19:10 +08:00
parent 4f9a9bfe85 850efa5eac
commit 5d22b8671e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/auto-generated

@ -1 +1 @@
Subproject commit 567e5d2612fc564464ccde9ba3da7cfdbc44880f
Subproject commit f966a8fc67e1a388b167c8b56279ff3e444b3351

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
966bc5a37a3c925e207d93e66c4913f05ba3bbb7
cbe012e3979f31ec4001d6a0b65ba46823b497d7