Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 		2015-05-24 22:46:05 +08:00
..
cpp-empty-test [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
cpp-tests Merge pull request #11946 from andyque/v3-final-android-9-patch-feature 2015-05-22 09:52:12 +08:00
game-controller-test [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
js-tests Merge pull request #11968 from jianglong0156/rebuildAutoBindingCons 2015-05-22 14:43:01 +08:00
lua-empty-test fix lua tests release mode linker issue 2015-05-23 08:48:53 +08:00
lua-game-controller-test [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
lua-tests Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 2015-05-24 22:46:05 +08:00