diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:52:32 +0200 |
| commit | e6c944939f88afe852d2d0a604fd9815c409f2eb (patch) | |
| tree | 644736aa8a6235dd1db6e1cef18ee1aec28439da /src/client/qwaylanddnd.cpp | |
| parent | dbf418dce41fe08368d38a098a771348a5b3d0fd (diff) | |
| parent | 4934b87156a889584a34e36c22abd9aee64cef7e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/client/qwaylandwindow.cpp
Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
Diffstat (limited to 'src/client/qwaylanddnd.cpp')
0 files changed, 0 insertions, 0 deletions