diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:19:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-11 10:50:02 +0200 |
| commit | 33ad940cddf0a9529f205fe645f1b1d76f6f04f1 (patch) | |
| tree | 72751567959407b3c50dc92c56529e6159099ce7 /src/compositor/doc/src/qtwaylandcompositor-overview.qdoc | |
| parent | 061ed4599dd2b384e4ef74b297640bf4e92f7f43 (diff) | |
| parent | 1bc3b0fdc8d934c1ab69a902054681896b56d672 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/client/qwaylanddisplay.cpp
src/client/qwaylanddisplay_p.h
src/client/qwaylandxdgpopup_p.h
Change-Id: If86ea09971773dc6c541f07819459a90e8ab73a0
Diffstat (limited to 'src/compositor/doc/src/qtwaylandcompositor-overview.qdoc')
0 files changed, 0 insertions, 0 deletions