axmol/build/cocos2d_libs.xcodeproj
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
..
project.pbxproj.REMOVED.git-id Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 2013-12-23 20:28:51 +08:00