Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 		2014-12-25 18:08:07 +08:00
..
cpp-empty-test Fixed compiling and linking error of lua tests when using NDK r10 above. 2014-11-27 13:56:15 +08:00
cpp-tests Merge branch 'v3' into modifyWidgetDefaultBehavior 2014-12-25 18:08:07 +08:00
game-controller-test Fixed compiling and linking error of lua tests when using NDK r10 above. 2014-11-27 13:56:15 +08:00
lua-empty-test Remove useless copy about luasocket on the android platform 2014-12-05 15:28:45 +08:00
lua-game-controller-test Fixed compiling and linking error of lua tests when using NDK r10 above. 2014-11-27 13:56:15 +08:00
lua-tests Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-22 11:14:31 +08:00