summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-13 12:48:34 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-14 12:55:44 +0100
commitda8cad03adb96879a6ab4664437d05cf42385ed6 (patch)
tree57618224fad40f7a857234cedfb2c8e0572c8eb8 /.gitattributes
parentd24ba64b514a46105df408c86413ebdf33d98af2 (diff)
parenta8574658549af784427b61a79210349eade586c6 (diff)
downloadqtlocation-da8cad03adb96879a6ab4664437d05cf42385ed6.tar.gz
Merge "Merge remote-tracking branch 'origin/5.14.0' into 5.14"
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions