James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge ... Conflicts: cocos2dx/Android.mk		2013-08-05 10:09:15 +08:00
..
CCDeprecated.h	Merge branch 'develop' into carlomorgantinizynga-new_develop_merge	2013-08-05 10:09:15 +08:00
CCEventType.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCProtocols.h	Fixed more documentation errors.	2013-08-01 20:55:43 +08:00
ccConfig.h	ccGLXXX -> GL::xxx	2013-07-25 18:42:53 -07:00
ccMacros.h	ccGLXXX -> GL::xxx	2013-07-25 18:42:53 -07:00
ccTypeInfo.h	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
ccTypes.h	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00
cocos2d.h	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge	2013-07-31 13:58:25 -07:00