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 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 		2016-05-25 19:19:27 +08:00
..
cocosbuilder Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
cocostudio Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2016-05-25 19:19:27 +08:00
spine Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00