James Chen 67d710a41c Adding Android support for new label.		2013-08-02 13:46:26 +08:00
..
android/prebuilt	Adding Android support for new label.	2013-08-02 13:46:26 +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	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00
linux	delete the file added by misstake.	2013-07-19 16:19:19 +08:00
mac	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07: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