James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge ... Conflicts: cocos2dx/Android.mk		2013-08-05 10:09:15 +08:00
..
CCAccelerometer.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCApplication.cpp	issue #2430: Fixing a typo.	2013-07-26 19:54:44 +08:00
CCApplication.h	Fixed more documentation errors.	2013-08-01 20:55:43 +08:00
CCCommon.cpp	More CCLog --> log.	2013-07-24 10:46:13 +08:00
CCDevice.cpp	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCEGLView.cpp	Linux: added SDL2 backend as replacement for GLFW.	2013-07-30 23:08:26 +04:00
CCEGLView.h	Linux: added SDL2 backend as replacement for GLFW.	2013-07-30 23:08:26 +04:00
CCFileUtilsLinux.cpp	Added some guards in file utils.	2013-07-26 14:19:20 +02: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 remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -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