summaryrefslogtreecommitdiff
path: root/src/compositor
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-15 11:05:20 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-15 11:05:20 +0100
commit4cba9d595311ac6040bf93450d1fb09ec0a3d9f4 (patch)
tree394c81793bde4a51cfac0c3cd352803ef39f7ade /src/compositor
parent3200e86cefd9a83cea45c7cab589bfbf1ff63f4f (diff)
parent0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb (diff)
downloadqtwayland-4cba9d595311ac6040bf93450d1fb09ec0a3d9f4.tar.gz
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: Ib5989d03612370116193266742e26094700be5c9
Diffstat (limited to 'src/compositor')
0 files changed, 0 insertions, 0 deletions