diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-02 16:52:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-02 16:52:15 +0200 |
| commit | 8831c9139e42e6357bf1ee84cba3b3b8041da502 (patch) | |
| tree | 73e918b8b28cef74152e1ec32d9dc869e56c7490 /tests/auto/client/xdgoutput/xdgoutput.pro | |
| parent | 8b69d52db792c3910be53321df44b5c57baa694c (diff) | |
| parent | c1b65146f6b9ad98edea424742f7594712758377 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/client/qwaylandwindow_p.h
Change-Id: Ic4104c48267d1682bb58d6b38afc833c39515eae
Diffstat (limited to 'tests/auto/client/xdgoutput/xdgoutput.pro')
0 files changed, 0 insertions, 0 deletions