WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 ... Conflicts: AUTHORS		2015-07-09 11:11:34 +08:00
..
cpp-empty-test	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8	2015-07-09 11:11:34 +08:00
game-controller-test	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
js-tests	add bool parm in android	2015-07-01 10:57:43 +08:00
lua-empty-test	[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.	2015-06-26 17:12:39 +08:00
lua-game-controller-test	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
lua-tests	Merge pull request #12550 from kompjoefriek/v3-vibrate	2015-06-30 10:28:59 +08:00