Merge remote-tracking branch 'origin/feature-34-test_framework' into hotfix-81-oaisim-2

Browse Source

Conflicts:
	cmake_targets/autotests/test_case_list.xml

...

This commit is contained in:

Florian Kaltenberger

2016-03-03 19:55:33 +01:00

parent 86ab3939ab 58fa110a0b

commit 87968cf1d4

9 changed files with 1458 additions and 1713 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

cmake_targets/autotests/test_case_list.xml

+1136 -231

File diff suppressed because it is too large Load Diff