James Chen 87736683c0 Merge pull request #3387 from pyrasis/tizen_2.2 ... [Tizen] Enable LocalStorage		2013-08-07 03:08:38 -07:00
..
android/prebuilt	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage	2013-08-06 13:37:38 +08:00
common/etc	issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined.	2013-08-02 16:02:40 +08:00
doc	issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D	2013-08-06 11:34:48 +08:00
emscripten	Remove freetype since it now works using Emscripten's SDL.	2013-05-16 17:34:33 -07:00
ios	issue #2345: fix mac crash due to libjpeg	2013-08-07 11:59:52 +08:00
linux	issue #2345: delete the linux png libraries.	2013-08-06 11:41:03 +08:00
mac	issue #2345: fix mac crash due to libjpeg	2013-08-07 11:59:52 +08:00
tizen	[Tizen] Enable LocalStorage	2013-08-07 19:01:41 +09:00
win32	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage	2013-08-06 13:37:38 +08:00