diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 11:55:59 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-31 11:55:59 +0100 |
commit | 1089546e8c47b59b42356d1c75651d082ce300dc (patch) | |
tree | 7854d3a4810d6640d4e124f4314c0bd7d7c0c288 /.gitattributes | |
parent | aabf2166fbbcea1aa33287501815d18cafe5ad82 (diff) | |
parent | 32a5e01adf346ed317bfc6d5c7f7e994099f2448 (diff) |
Merge remote-tracking branch 'origin/5.12.7' into 5.12
Change-Id: Ic0592c48c1e9880d7276fb1a8361d4dc7c422a98
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions