minggo b275a3e2f0 fix conflict		2017-09-20 09:11:35 +08:00
..
cpp-empty-test	fix conflict	2017-09-20 09:11:35 +08:00
cpp-tests	fix conflict	2017-09-20 09:11:35 +08:00
game-controller-test	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00
js-memory-gc-tests	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00
js-tests	fix conflict	2017-09-20 09:11:35 +08:00
lua-empty-test	fix conflict	2017-09-20 09:11:35 +08:00
lua-game-controller-test	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00
lua-tests	fix conflict	2017-09-20 09:11:35 +08:00
performance-tests	[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271)	2017-09-18 15:12:30 +08:00