Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CCArmature
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
..
animation Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
datas Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
display Merge branch 'develop' into dictionary_array_fixes 2013-08-21 21:27:44 -07:00
external_tool Better destructors logs 2013-08-21 20:08:51 -07:00
physics Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
utils Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCArmature.cpp Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCArmature.h issue #2404: [Extensions] Updating the file for deprecated methods. 2013-07-24 18:00:40 +08:00
CCBone.cpp fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
CCBone.h Yet another documentation fix. 2013-08-01 21:40:13 +08:00