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

This commit is contained in:
Dhilan007 2013-10-16 17:51:02 +08:00
parent c6344875de cee53d8ac3
commit a91621ae5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
97bf8ff69bab6a8a85dc80aca3938ca96cbfe2e5
81e5f8f3e9c025447f9dd4da9fba085d46f661d9

2
cocos/scripting/auto-generated

@ -1 +1 @@
Subproject commit ba1165bab00a7ba34de057b28f272f31f50a303a
Subproject commit 73aebd082ae63561cc1ca769f28e302820da7e39