Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 		2015-12-20 22:56:33 +08:00
..
cpp-empty-test updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
cpp-tests Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
game-controller-test [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
js-tests fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
lua-empty-test Fix compile error 2015-12-04 17:22:41 +08:00
lua-game-controller-test [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
lua-tests fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
performance-tests Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 2015-10-27 17:28:22 +08:00