axmol/cocos2dx/platform/third_party/ios/libraries
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
..
libcurl.a.REMOVED.git-id issue #1489: update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
libfreetype.a.REMOVED.git-id library compiled without bzip2 2013-07-12 11:58:42 -07:00
libjpeg.a.REMOVED.git-id refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
libpng.a.REMOVED.git-id refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
libtiff.a.REMOVED.git-id refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
libwebp.a.REMOVED.git-id issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00