Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge ... Conflicts: cocos2dx/textures/CCTexture2D.h samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp scripting/javascript/bindings/generated tools/bindings-generator		2013-07-24 15:15:08 -07:00
..
CCDeprecated.h	Put the deprecated method 'CCLog' to 'CCDeprecated.h'.	2013-07-24 10:26:36 +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	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
ccMacros.h	More best practices fixes and other bug fixes	2013-07-23 15:20:22 -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	Merge branch 'developNewLabelForRiq' into label_merge	2013-07-24 15:15:08 -07:00