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 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
 		2014-07-08 14:57:19 +08:00
..
cpp-empty-test add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
cpp-tests Merge pull request #7267 from andyque/addBinaryFileTests 2014-07-08 09:51:17 +08:00
game-controller-test update test case 2014-07-07 17:57:08 +08:00
lua-empty-test add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
lua-tests Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-08 14:57:19 +08:00