Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole Conflicts: cocos/scripting/auto-generated
2013-12-05 12:48:32 +08:00
133130a8ae8d6597399a7de05ba9b63ee55f5e2d