axmol/cocos2dx/actions
James Chen 976d4ad11e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
Conflicts:
	cocos2dx/actions/CCActionInterval.cpp
	cocos2dx/cocoa/CCDictionary.cpp
	samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
..
CCAction.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCAction.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionCamera.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionCamera.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionCatmullRom.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionCatmullRom.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionEase.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionEase.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionGrid.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionGrid.h vertex --> getVertex, originalVertex --> getOriginVertex. 2013-07-08 15:12:06 +08:00
CCActionGrid3D.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionGrid3D.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionInstant.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 2013-07-09 09:48:41 +08:00
CCActionInstant.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionInterval.cpp Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 2013-07-09 09:48:41 +08:00
CCActionInterval.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionManager.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCActionManager.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCActionPageTurn3D.cpp issue #2300: Warning fixes. 2013-07-08 23:12:11 +08:00
CCActionPageTurn3D.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCActionProgressTimer.cpp issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionProgressTimer.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionTiledGrid.cpp issue #2300: Warning fixes. 2013-07-08 23:12:11 +08:00
CCActionTiledGrid.h issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
CCActionTween.cpp issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCActionTween.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00