summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2019-08-05 11:28:30 +0200
committerOliver Wolff <oliver.wolff@qt.io>2019-08-12 08:09:19 +0200
commitcfc5eaa6904354fc3084659691a6f28a51bf2269 (patch)
treeda49c1c9717a03cdc2e69970ad4848e989e6bb8c /.gitattributes
parent8b7b52d66f2616040ca4aaae3f2732be96e19ab8 (diff)
parent99db6526341e6f0f2a4798088c1f954cff013b7b (diff)
Merge "Merge remote-tracking branch 'origin/dev' into wip/win"
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions