Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes ... Conflicts: cocos2dx/cocoa/CCArray.cpp cocos2dx/cocoa/CCArray.h cocos2dx/label_nodes/CCLabel.cpp extensions/CCArmature/datas/CCDatas.cpp extensions/CCArmature/display/CCDisplayManager.cpp		2013-08-21 21:27:44 -07:00
..
CCAnimation.cpp	Better destructors logs	2013-08-21 20:08:51 -07:00
CCAnimation.h	Surround code in document with code/endcode tags.	2013-08-01 16:57:42 +08:00
CCAnimationCache.cpp	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
CCAnimationCache.h	Fixes tag typos: deprecatd -> deprecated	2013-08-01 17:09:23 +08:00
CCSprite.cpp	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
CCSprite.h	Change some doc due to the change of source code.	2013-08-01 17:47:37 +08:00
CCSpriteBatchNode.cpp	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
CCSpriteBatchNode.h	issue #2378: More override functions.	2013-07-23 21:51:19 +08:00
CCSpriteFrame.cpp	Better destructors logs	2013-08-21 20:08:51 -07:00
CCSpriteFrame.h	more best practices fixes	2013-07-17 16:56:19 -07:00
CCSpriteFrameCache.cpp	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
CCSpriteFrameCache.h	Use C++ code in C++ comments.	2013-08-01 16:40:56 +08:00