summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-11 03:01:39 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-11 03:01:40 +0100
commit97daefa38500e24f38c02089319eebe6ae915ad2 (patch)
tree53c8e61728d492ece89f53771775877c23239f40 /.gitattributes
parent5472d45b461749c440b2f9743e1e07ee0d5e9a48 (diff)
parentb5566b980f267380f157cb6084ee77136ee8af2c (diff)
downloadqtsvg-97daefa38500e24f38c02089319eebe6ae915ad2.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I73749df0817d0fc5af4050d4155e2c90c12ce81d
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions