Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 		2014-12-04 15:32:25 +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' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-04 15:32:25 +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 Merge pull request #9267 from samuele3hu/v3_strip 2014-11-27 20:21:06 +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 Fix the error that SpritePerformanceTest lua does’t work 2014-11-28 11:54:38 +08:00