diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-21 09:56:50 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 09:57:00 +0100 |
commit | 1820ec590050d37fc7b66cf1f6716f972eb6d684 (patch) | |
tree | 52d54ea7ff921005936e122d74eb4d0a57c49bce /wayland/democompositor/main.cpp | |
parent | c22860511e43ac88a2bad398a0dfcea537501e16 (diff) | |
parent | f9c7da64cea85d44998e62f4e0d3ec217a22f0d2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I08eb1b887d7b8cfaae3e105d176136886682c865
Diffstat (limited to 'wayland/democompositor/main.cpp')
0 files changed, 0 insertions, 0 deletions