carlo morgantini 8416e7cf6d Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj scripting/javascript/bindings/generated tools/bindings-generator		2013-07-26 15:54:50 -07:00
..
CCDeprecated.h	issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.	2013-07-27 00:55:41 +08:00
CCEventType.h	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
CCProtocols.h	issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros.	2013-07-23 18:26:26 +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	More constant fixes	2013-07-25 14:49:43 -07:00
cocos2d.h	Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq	2013-07-26 11:58:18 -07:00