summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-12-10 13:51:40 +0200
committerLiang Qi <liang.qi@qt.io>2019-12-10 17:53:06 +0200
commit979b9335e5cec4a4556624dfab06d088b82cec36 (patch)
treeab2c9463ea3e4a529e52943a823093ee6901eb0f /lib
parent30e32870a052fda1a23099e46864242e52d94a17 (diff)
parent90210d5d9c4029057035019f144212922494ff0a (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions