summaryrefslogtreecommitdiffstats
path: root/src/plugins/printsupport
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-20 19:23:14 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-04-20 20:06:18 +0000
commit100ebf1c97dec1fcfea29d790c07993d071cbb3f (patch)
treeb1f12ddf8834ba77f2143344008b0e9f673cdda1 /src/plugins/printsupport
parentf35f282c4f0ef11dc35bc9120852ff9e77f85297 (diff)
parent6f45fda50b6dbb0704a71a15f38d44027b4b1816 (diff)
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/printsupport')
0 files changed, 0 insertions, 0 deletions