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
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 		2013-11-12 15:30:36 +08:00
..
cocosbuilder remove makefiles 2013-11-11 17:29:48 +08:00
cocostudio Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 15:30:36 +08:00
spine remove makefiles 2013-11-11 17:29:48 +08:00