Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/textures/CCTexture2D.h samples/Javascript/Shared		2013-07-19 16:04:23 -07:00
..
CCAccelerometer.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCApplication.cpp	issue #2397: Mark Application::sharedApplication as deprecated function.	2013-07-15 16:37:38 +08:00
CCApplication.h	issue #2397: Mark Application::sharedApplication as deprecated function.	2013-07-15 16:37:38 +08:00
CCCommon.cpp	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCDevice.cpp	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCEGLView.cpp	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
CCEGLView.h	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
CCFileUtilsLinux.cpp	issue #2397: FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp	2013-07-12 15:00:10 +08:00
CCFileUtilsLinux.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCGL.h	[FIX] testjs	2012-08-02 16:23:31 +08:00
CCImage.cpp	Merge branch 'developNewLabelMerge' into merge_new_label	2013-07-19 16:04:23 -07:00
CCPlatformDefine.h	Fixes #1317 by http://gcc.gnu.org/wiki/Visibility	2012-09-19 04:59:33 +09:00
CCStdC.cpp	[FIX] testjs	2012-08-02 16:23:31 +08:00
CCStdC.h	Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.	2012-08-29 14:49:02 -07:00