summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions/qwaylandwlshell.cpp
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2016-06-13 10:24:54 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-06-13 11:03:17 +0000
commitb8d74c81e501f05d7d91c0b236e070729514d866 (patch)
treee17614e909cb2f0f41b7ded42db423b623b0b0e3 /src/compositor/extensions/qwaylandwlshell.cpp
parent8fb6644c79acdec67f7cc436b9971348b6e202ec (diff)
parent83f748ade15c0d85b87c6bde732d847cab826985 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/compositor/extensions/qwaylandwlshell.cpp')
0 files changed, 0 insertions, 0 deletions