summaryrefslogtreecommitdiff
path: root/src/effects
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-11 03:02:19 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-11 03:02:19 +0200
commit314a2b53a885a41f0a220fdcd5e8cd4592078b29 (patch)
tree103660f087fa8ef9c3748de176fd9d13e3c6fc1d /src/effects
parent69dddc6190800b56b88f3322c231e67a5b86fdd0 (diff)
parent965da52a583a27fc41a489a4141f78c3acb0d143 (diff)
downloadqtgraphicaleffects-314a2b53a885a41f0a220fdcd5e8cd4592078b29.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1
Change-Id: I9d5292b275ce2a672b1c9ea9853645b036395711
Diffstat (limited to 'src/effects')
0 files changed, 0 insertions, 0 deletions