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
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 		2014-04-24 16:58:46 +08:00
..
cocosbuilder replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
cocostudio Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
spine replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00