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
minggo	0530109a9f	Merge pull request #3178 from boyu0/2345 ... Refactor CCImage and CCTexture2D	2013-07-31 01:21:18 -07:00
minggo	ba4e0d8d39	closed #2438:re-add libwebp.a	2013-07-30 18:06:01 +08:00
minggo	1d2b1c79c2	closed #2438:remove mac 32-bit support	2013-07-30 18:02:35 +08: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
billy1380	cdfe693583	- changed cocos2d mac project to support universal build and x86 ... - fixed issues associated with that	2013-03-23 16:04:51 +00:00
James Chen	cc690c5a86	issue #1770: Adding webp support for mac port.	2013-02-06 13:06:48 +08:00