diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:46:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-16 09:46:53 +0200 |
| commit | 6eda0ca6aff3df020f71c74a3834f388cbdc685d (patch) | |
| tree | 1b62ae5adb63113222b3339a2910150c18cc137a /src/compositor/compositor_api/qwaylandkeyboard_p.h | |
| parent | 4de344decf7db4d7703575a78d6013a5c776bf1e (diff) | |
| parent | 0b51286635ca3f724df94dd4d5268c950505f6ec (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/client/qwaylanddisplay_p.h
Change-Id: Ie84862aa41623c11abd8f882f428054f30062c77
Diffstat (limited to 'src/compositor/compositor_api/qwaylandkeyboard_p.h')
0 files changed, 0 insertions, 0 deletions