summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:36 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-11 03:01:36 +0200
commit4d30c57951c65e7b3444447060323dd21be29637 (patch)
treed309a88096ea788346b3111b4b26815ec3b272e0 /src/shared
parent8e3c53a196f66a1c9a370cda1dfde51792f92364 (diff)
parent0d2a9408ed2a5c664330c5742c9afb610a6c7348 (diff)
downloadqttools-4d30c57951c65e7b3444447060323dd21be29637.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ib0252441ebf43cbd0857bae7b72a7567473105fa
Diffstat (limited to 'src/shared')
0 files changed, 0 insertions, 0 deletions