boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345		2013-07-27 22:06:30 +08:00
..
android/prebuilt	fixed #1904:strip libcurl.a on x86 architecture	2013-04-10 09:40:44 +08:00
common	Combine CCTextureETC to CCImage and CCTexture2D.	2013-07-26 17:34:44 +08:00
emscripten	Remove freetype since it now works using Emscripten's SDL.	2013-05-16 17:34:33 -07:00
ios	refactor CCImage and CCTexture2D	2013-07-17 17:12:04 +08:00
linux	delete the file added by misstake.	2013-07-19 16:19:19 +08:00
mac	refactor CCImage and CCTexture2D	2013-07-17 17:12:04 +08:00
tizen	Support Tizen 2.2 SDK.	2013-07-10 13:04:08 +09:00
win32	issue #2305: [Win32] Removing the third party library pthreadVCE2.	2013-06-26 12:52:38 +08:00