axmol/build/cocos2d_libs.xcodeproj
Ricardo Quesada 97fb43b8d7 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
..
project.pbxproj.REMOVED.git-id Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 2013-12-06 11:19:12 -08:00