diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-03 13:20:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-03 13:20:55 +0100 |
| commit | 88af49bdfe4e87d1832240a65d842e9126b7bb63 (patch) | |
| tree | ac58fee5006d11442b0bf4c2009c6831d10e5a3b /examples/wayland/minimal-cpp/window.cpp | |
| parent | f312eb3c05613a9ca988a92bf155264d619d8b6a (diff) | |
| parent | 143a6ad82ea0ded69da482eff1750082fd5b2a6a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/client/qwaylandinputdevice.cpp
Change-Id: I4f985d6e47b4199a940ff1cd40e65165c28e49b2
Diffstat (limited to 'examples/wayland/minimal-cpp/window.cpp')
0 files changed, 0 insertions, 0 deletions