diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 14:31:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 14:31:15 +0200 |
| commit | 3f5111b6c1d92ae4fed008abb53cf4226bfef575 (patch) | |
| tree | 53654662cd75aef95a343593295f1be48a1a007c /examples/wayland/spanning-screens/spanning-screens.pro | |
| parent | 5f256690a1e953ed456988b83daf43139b828131 (diff) | |
| parent | fcaa38c84dc92ec951c43e1759d7a46080755cbc (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/compositor/extensions/qwaylandxdgshell.cpp
Change-Id: Ic45b930e01fec803287d63b6f2347f45b7638ffc
Diffstat (limited to 'examples/wayland/spanning-screens/spanning-screens.pro')
0 files changed, 0 insertions, 0 deletions