axmol/cocos2dx/platform
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
Conflicts:
	cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
..
android Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
blackberry Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
emscripten Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
ios Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
linux Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 2013-08-05 10:09:15 +08:00
mac Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
nacl Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
qt5 Merge pull request #3347 from timothyqiu/docfix 2013-08-01 18:22:43 -07:00
third_party Adding Android support for new label. 2013-08-02 13:46:26 +08:00
tizen Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
win32 closed #2469:LabelTest and TileMapTest crash on windows. 2013-08-02 17:31:19 +08:00
CCAccelerometerDelegate.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCApplicationProtocol.h Fixed more documentation errors. 2013-08-01 20:55:43 +08:00
CCCommon.h enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
CCDevice.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCEGLViewProtocol.cpp Linux: added SDL2 backend as replacement for GLFW. 2013-07-30 23:08:26 +04:00
CCEGLViewProtocol.h Linux: added SDL2 backend as replacement for GLFW. 2013-07-30 23:08:26 +04:00
CCFileUtils.cpp Removes Hungarian notation 2013-07-25 15:53:24 -07:00
CCFileUtils.h Yet another documentation fix. 2013-08-01 21:40:13 +08:00
CCImage.h Yet another documentation fix. 2013-08-01 21:40:13 +08:00
CCImageCommon_cpp.h fix the travis ci compile error 2013-07-30 14:16:23 +08:00
CCPlatformConfig.h Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
CCPlatformMacros.h Remove colon after @param @warning @deprecated 2013-07-30 10:56:14 +08:00
CCSAXParser.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07: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