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
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 		2014-08-21 16:07:19 +08:00
..
cocosbuilder use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
cocostudio Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
spine use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00