axmol/cocos2dx/platform
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
2013-07-16 16:33:02 +08:00
..
android issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
blackberry issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
emscripten issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
ios issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
linux issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
mac issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
marmalade issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
nacl issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
third_party Support Tizen 2.2 SDK. 2013-07-10 13:04:08 +09:00
tizen issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
win32 Merge pull request #3154 from minggo/add-deprecated-header 2013-07-15 03:20:32 -07: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 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
CCEGLViewProtocol.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCFileUtils.cpp Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 2013-07-16 16:33:02 +08:00
CCFileUtils.h getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07: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 getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -07:00
CCPlatformConfig.h Adding defines and enums for Tizen. 2013-05-16 19:49:16 +09:00
CCPlatformMacros.h Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
CCSAXParser.cpp getInstance() / destroyInstance() are used... 2013-07-11 15:24:23 -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
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