diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:23 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:23 +0200 |
commit | 186ccec24e0974dea7cd72badf404f53816092e0 (patch) | |
tree | 171e74aa4a982b2793b10295870740ccfd3e777c /tests/auto/compositor/compositor/mockclient.h | |
parent | 58e6781645230f1dc672138776bfe1bc467129f4 (diff) | |
parent | 91ed3e7c5800a6ef4bea9d0c4d80196f94caec95 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iab50e5a4af2e2adc4dd40575b7039dadb6d514b5
Diffstat (limited to 'tests/auto/compositor/compositor/mockclient.h')
0 files changed, 0 insertions, 0 deletions