axmol/cocos/2d/platform
James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
Conflicts:
	cocos/2d/platform/win32/CCImage.cpp
2014-02-17 22:10:45 +08:00
..
android move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
apple update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
desktop issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
ios Typo fix in CCDevice.mm. 2014-02-14 09:41:06 +08:00
linux move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
mac closed #4048:fixed LabelTTFMultiline test case show nothing on mac. 2014-02-17 14:35:49 +08:00
win32 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289 2014-02-17 22:10:45 +08:00
CCApplicationProtocol.h GLView improvements 2014-01-23 15:36:55 -08:00
CCCommon.h Added Dutch for 3.x branch 2014-01-25 20:38:15 +00:00
CCDevice.h move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
CCFileUtils.cpp use data.isNull() instead of !data.getBytes() 2014-01-16 10:09:04 +08:00
CCFileUtils.h Performance Test fixes 2014-01-14 17:22:45 -08:00
CCGLViewProtocol.cpp better Console support 2014-02-08 12:46:44 -08:00
CCGLViewProtocol.h better Console support 2014-02-08 12:46:44 -08:00
CCImage.cpp move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
CCImage.h move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
CCSAXParser.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCSAXParser.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCThread.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCThread.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00