9 Commits

Author	SHA1	Message	Date
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
boyu0	70140bb4cb	refactor CCImage and CCTexture2D	2013-07-17 17:12:04 +08:00
Ricardo Quesada	a598db0db0	library compiled without bzip2	2013-07-12 11:58:42 -07:00
Ricardo Quesada	2d0aed4f0e	libfreetype for iOS and Mac ... libfreetype for iOS and Mac	2013-07-11 17:20:10 -07:00
minggo	c8baa94753	issue #1489: update ios libcurl and add android project	2013-02-25 14:33:04 +08:00
James Chen	a94e1b2a9d	issue #1770: Webp works ok on Android and iOS.	2013-02-05 18:18:53 +08:00
James Chen	26547c7b30	fixed #1548: Updated libcurl header files to 7.26.0 on iOS.	2012-11-05 13:13:46 +08:00
jzgenius	ad5b687848	[lib] New libcurl.a, armv7 & armv7s & simulator Supported.	2012-09-22 13:16:23 +08:00
minggo	a4e9f1c18d	libcurl works ok on ios	2011-04-18 14:12:41 +08:00