diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:59:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:59:57 +0100 |
| commit | b67d79067515c3f34a8b84fee9fef8484fbdad76 (patch) | |
| tree | 638ff84179a564306f3037ca1c95947982650506 /tests/auto/compositor/compositor/tst_compositor.cpp | |
| parent | 06230d22488796d92ea130e985d1e0ee2ed05199 (diff) | |
| parent | 9f1db9d0ae60ffe8be1453a57be3b8f2861e4882 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/compositor/extensions/extensions.pri
Change-Id: Ia9a5bd52b7cac9a4f66e7c5deb43d89f0c792325
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
0 files changed, 0 insertions, 0 deletions