Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support
History
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
 		2013-12-20 21:12:11 +08:00
..
cocosbuilder Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 2013-12-20 21:12:11 +08:00
cocostudio Merge pull request #4567 from dumganhar/for_each-gone 2013-12-19 18:50:50 -08:00
spine closed #3465: New spine runtime support, update CMakeLists.txt 2013-12-20 20:18:32 +08:00