Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest
History
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 		2014-06-23 09:37:39 +08:00
..
ArmatureScene.cpp Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
ArmatureScene.h add binary read to test-cpp 2014-06-18 20:09:12 +08:00