diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:27 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:27 +0200 |
commit | d3d3db5a75fe2ba992742e418bfefa25eddf7684 (patch) | |
tree | 7131b3fee95bdf30c92683c13bc9d121d670cc5b /.gitattributes | |
parent | 6d7af57f10ed2a02579e0e0f36b07926950ab3e5 (diff) | |
parent | 78bc427395116bfaf3d99134f42aec5310020f8e (diff) | |
download | qtsvg-d3d3db5a75fe2ba992742e418bfefa25eddf7684.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: I7680d625bf0afec0bfd16a97c6656aab426f39a7
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions