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
History
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 		2013-12-26 12:55:52 +08:00
..
project.pbxproj.REMOVED.git-id Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00