Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build/cocos2d_libs.xcodeproj
History
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 		2013-11-12 15:30:36 +08:00
..
project.pbxproj.REMOVED.git-id Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 15:30:36 +08:00