summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-01 01:00:23 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2020-03-03 14:13:02 +0100
commit63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch)
treefc850de8f31581cc6a64db7a78d1cca479e20ce9 /lib
parent5ebb03c47604e0597502fbe1069de636987f33fc (diff)
parentfbebc93617d99d2bf8fed559f17dba8bed15a063 (diff)
downloadqtbase-63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions