Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/libcocos2d_8_1
History
geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
 		2015-07-24 11:38:09 +08:00
..
libcocos2d_8_1 Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 2015-07-24 11:38:09 +08:00
libcocos2d_8_1.sln Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00