summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-09 16:00:53 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-08-09 16:00:53 +0000
commit2579fe7bfdf5b215fccacc641b986102664ccffa (patch)
tree4ad293f8c8e2d6ede34abed48d5e95e327e15762 /.gitattributes
parent39def876a641e0fff42298c61bbe3d3fafaf47af (diff)
parent22e96c4d342de3bfe4fc27f4cd7233edcfe737cc (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions