axmol/cocos2dx/platform
carlo morgantini ea72e046c6 Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
2013-07-11 17:38:07 -07:00
..
android fixed conflict 2013-07-09 10:39:16 +08:00
blackberry issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
emscripten Fixing compilation errors for Emscripten port. 2013-06-24 10:21:36 +08:00
ios Merge branch 'develop' into ios_mac_one_project 2013-07-03 11:39:00 -07:00
linux start integrating FreeType for font rendering 2013-07-11 15:43:45 -07:00
mac issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
marmalade issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
nacl [NaCl] Don't cache font size 2013-06-20 12:56:13 -07:00
third_party libfreetype for iOS and Mac 2013-07-11 17:20:10 -07:00
tizen Fix compile error. 2013-06-20 19:20:27 +09:00
win32 [Windows] Fixing complication errors for WINDOWS. 2013-07-06 10:49:13 +08:00
CCAccelerometerDelegate.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplicationProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCCommon.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDevice.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtils.cpp issue #2371: std::vector<std::string>::iterator --> auto in CCFileUtils.cpp. 2013-07-04 16:30:35 +08:00
CCFileUtils.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImage.h issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
CCImageCommonWebp.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCImageCommon_cpp.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCPlatformConfig.h Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
CCPlatformMacros.h Adds const to getters 2013-07-03 17:22:15 -07:00
CCSAXParser.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCSAXParser.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCThread.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
platform.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00