summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2020-04-20 10:34:48 +0200
committerLiang Qi <liang.qi@qt.io>2020-04-20 19:09:58 +0200
commitfa83b30ceb1861075e33dc8340d6754daef86b95 (patch)
tree219faff43cc3a224b653eae30bd0be4eb9f3bc3e /src/3rdparty
parent559bd88bce66e673b5215a8b3ebf1d714a23c299 (diff)
parentad9c70c3bbf293427882ba4dbe878f02a6ba98c7 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions