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
..
CCParallaxNode.cpp	issue #2378: More setter/Getter, removing CC_PROPERTY_XXX macros.	2013-07-23 18:26:26 +08:00
CCParallaxNode.h	Fixes some warnings	2013-07-24 14:02:36 -07:00
CCTMXLayer.cpp	Fixing warnings of the order of member variables and fixing errors for tizen projects.	2013-07-29 14:07:57 +08:00
CCTMXLayer.h	Compiles with improved CCArray	2013-08-19 17:09:28 -07:00
CCTMXObjectGroup.cpp	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
CCTMXObjectGroup.h	issue #2404:Add more functions to Deprecated.lua and modify some .pkg files	2013-07-25 19:58:59 +08:00
CCTMXTiledMap.cpp	More best practices fixes and other bug fixes	2013-07-23 15:20:22 -07:00
CCTMXTiledMap.h	More best practices fixes and other bug fixes	2013-07-23 15:20:22 -07:00
CCTMXXMLParser.cpp	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
CCTMXXMLParser.h	issue #2378: Mark getStoringCharacters as deprecated function.	2013-07-23 21:56:01 +08:00
CCTileMapAtlas.cpp	Array & Dictionary fixes	2013-08-21 20:12:09 -07:00
CCTileMapAtlas.h	issue #2378: inline function are in header files now.	2013-07-23 20:36:41 +08:00