summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:32:36 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-28 09:32:36 +0100
commit9ee5ee12a7b92a57624dafed935b3ac1fad426d9 (patch)
tree90b5011b97e41abdeab8c4216f12b1ffb82fe799 /.gitattributes
parent27125f58a76f4283753edbb53813260bf40a4424 (diff)
parent3bc5fc54165a72b2e1b820ca1f389a048ecdcf30 (diff)
downloadqtsvg-9ee5ee12a7b92a57624dafed935b3ac1fad426d9.tar.gz
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I4e901d3337a82cf07a0ac9aa56ed02a400d6905d
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions