Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/CocoStudio/Reader
History
James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 		2013-09-16 18:18:23 +08:00
..
CCSGUIReader.cpp Modify member names 2013-09-16 17:12:15 +08:00
CCSGUIReader.h Modify member names 2013-09-16 17:12:15 +08:00
CCSSceneReader.cpp Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +08:00
CCSSceneReader.h 1. Adds SceneEditorTest hd version 2013-09-14 16:34:26 +08:00