summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-04 03:03:25 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-04 03:03:25 +0100
commit5472d45b461749c440b2f9743e1e07ee0d5e9a48 (patch)
tree6c4e98ff4f3f7316853e97c7ce5573c90fadfe27 /.gitattributes
parent95adb2fb5b068be9dfd5253c04a00bcd98fe27bb (diff)
parent1a66404fd0312a835da03a940894737c1bf77310 (diff)
downloadqtsvg-5472d45b461749c440b2f9743e1e07ee0d5e9a48.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4221ef67f66bdf111a04978d1e8976339f8071af
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions