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
Ricardo Quesada f68dcd9969 Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/tests.h
 		2013-12-05 11:47:46 -08:00
..
project.pbxproj.REMOVED.git-id Merge branch 'develop' into newRenderer 2013-12-05 11:47:46 -08:00