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
..
curl	fixed #1548: Updated libcurl header files to 7.26.0 on iOS.	2012-11-05 13:13:46 +08:00
libfreetype2	libfreetype for iOS and Mac	2013-07-11 17:20:10 -07:00
libraries	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00
webp	issue #1770: Webp works ok on Android and iOS.	2013-02-05 18:18:53 +08:00