yinkaile 5e1f91d396 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop ... Conflicts: extensions/CocoStudio/Armature/CCArmature.h extensions/CocoStudio/Armature/CCBone.h extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h extensions/CocoStudio/Armature/animation/CCProcessBase.h extensions/CocoStudio/Armature/animation/CCTween.h extensions/CocoStudio/Armature/datas/CCDatas.h extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h extensions/CocoStudio/Armature/display/CCDisplayManager.h extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h extensions/CocoStudio/Armature/physics/CCColliderDetector.h extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h		2013-09-14 19:54:49 +08:00
..
Animation.cpp	…
Animation.h	…
AnimationState.cpp	…
AnimationState.h	…
AnimationStateData.cpp	…
AnimationStateData.h	…
Atlas.cpp	…
Atlas.h	…
AtlasAttachmentLoader.cpp	…
AtlasAttachmentLoader.h	…
Attachment.cpp	…
Attachment.h	…
AttachmentLoader.cpp	…
AttachmentLoader.h	…
Bone.cpp	…
Bone.h	…
BoneData.cpp	…
BoneData.h	…
CCSkeleton.cpp	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop	2013-09-14 19:54:49 +08:00
CCSkeleton.h	…
CCSkeletonAnimation.cpp	…
CCSkeletonAnimation.h	…
Json.cpp	…
Json.h	…
RegionAttachment.cpp	…
RegionAttachment.h	…
Skeleton.cpp	…
Skeleton.h	…
SkeletonData.cpp	…
SkeletonData.h	…
SkeletonJson.cpp	…
SkeletonJson.h	…
Skin.cpp	…
Skin.h	…
Slot.cpp	…
Slot.h	…
SlotData.cpp	…
SlotData.h	…
extension.cpp	…
extension.h	…
spine-cocos2dx.cpp	…
spine-cocos2dx.h	…
spine.h	…