Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2d_libs.xcodeproj
History
carlo morgantini ea72e046c6 Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
 		2013-07-11 17:38:07 -07:00
..
project.pbxproj.REMOVED.git-id Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel 2013-07-11 17:38:07 -07:00