minggo f6cfe3007f issue #2412:fix merging conflict		2013-07-23 10:41:11 +08:00
..
CCDeprecated.h	issue #2404: Marking CC prefix class as deprecated.	2013-07-18 13:38:23 +08:00
CCEventType.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCProtocols.h	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
ccConfig.h	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
ccMacros.h	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
ccTypeInfo.h	CCAssert -> CCASSERT	2013-07-19 22:01:27 -07:00
ccTypes.h	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
cocos2d.h	issue #2412:fix merging conflict	2013-07-23 10:41:11 +08:00