Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/textures/CCTexture2D.h samples/Javascript/Shared		2013-07-19 16:04:23 -07:00
..
android/prebuilt	fixed #1904:strip libcurl.a on x86 architecture	2013-04-10 09:40:44 +08:00
blackberry	issue #1770: Adding webp support for blackberry and marmalade.	2013-02-06 10:52:13 +08:00
emscripten	Remove freetype since it now works using Emscripten's SDL.	2013-05-16 17:34:33 -07:00
ios	library compiled without bzip2	2013-07-12 11:58:42 -07:00
linux	fixed #2042: remove libxml2	2013-04-10 09:56:31 +08:00
mac	library compiled without bzip2	2013-07-12 11:58:42 -07:00
marmalade	fixed #2042: remove libxml2	2013-04-10 09:56:31 +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