summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:30:26 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:30:26 +0200
commitcdba6157bf37758f0260f172669f3c1506976bb0 (patch)
tree9ac70fff52d879e2e17b08b5a44348a145f2150c /.gitattributes
parent484e9de6d86d011bd349890cba87a25554b0f672 (diff)
parenta3d8a431aaed65ee49cc9405f4f1ebd9e268a008 (diff)
downloadqtscript-cdba6157bf37758f0260f172669f3c1506976bb0.tar.gz
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: I90598c490c543edcaa6d6e78b9703627768aee80
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions