Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/cocoa
History
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
..
CCAffineTransform.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCAffineTransform.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCArray.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCArray.h Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCAutoreleasePool.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCAutoreleasePool.h Documentation & Cocos2d-x C++ Style 2013-08-09 12:40:20 +08:00
CCBool.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCData.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCData.h Better destructors logs 2013-08-21 20:08:51 -07:00
CCDataVisitor.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCDataVisitor.h Remove unnecessary/wrong use of \a in comment. 2013-07-30 10:56:13 +08:00
CCDictionary.cpp Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
CCDictionary.h Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCDouble.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCFloat.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCGeometry.cpp CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
CCGeometry.h Change some doc due to the change of source code. 2013-08-01 17:47:37 +08:00
CCInteger.h Better destructors logs 2013-08-21 20:08:51 -07:00
CCNS.cpp issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCNS.h issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
CCObject.cpp Documentation & Cocos2d-x C++ Style 2013-08-09 12:40:20 +08:00
CCObject.h Documentation & Cocos2d-x C++ Style 2013-08-09 12:40:20 +08:00
CCSet.cpp closed #2361:fix a crsash caused by Set::removeAllObjects 2013-07-03 15:26:58 +08:00
CCSet.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCString.cpp Better destructors logs 2013-08-21 20:08:51 -07:00
CCString.h Removes Hungarian notation 2013-07-25 15:53:24 -07:00