diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-23 16:05:48 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-23 16:05:48 +0100 |
commit | caf565a6a538bbd66f1867a2608bd6a8ac07d4fd (patch) | |
tree | b8b19ebf66290f774747365eebd5b58c5ec0819f /tests/CMakeLists.txt | |
parent | d8b2f7aba3ab58914db6fb0b5234225db1402b15 (diff) | |
parent | af5ff32b9b21a95da71e07e6aee6e07938a195a8 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: I15dc8f6d292527b8686271c575b1f57897d17806
Diffstat (limited to 'tests/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions