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 b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
 		2013-07-31 13:58:25 -07:00
..
project.pbxproj.REMOVED.git-id Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00