Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CocoStudio/Armature
History
yinkaile dfc40d354e Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CocoStudio/Armature/CCArmature.cpp
	extensions/CocoStudio/Armature/CCBone.cpp
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
	extensions/CocoStudio/Armature/display/CCSkin.cpp
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
 		2013-10-29 16:18:00 +08:00
..
display Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-10-29 16:18:00 +08:00
utils Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-10-29 16:18:00 +08:00
CCArmature.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCBone.cpp issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCBone.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00