summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-21 03:02:04 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-21 03:02:04 +0200
commit9d13c38a0c316a347c4c901e1ba1c6306cd824f3 (patch)
tree263bea322ec9de03b4308558819e1b965858c658 /.gitattributes
parentec18eea6ed408d95110946e9bf2f386711731373 (diff)
parent35645ce85bd0d48e8fd74b59898394e678ce1655 (diff)
downloadqtx11extras-9d13c38a0c316a347c4c901e1ba1c6306cd824f3.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9c347b8f3f941ad15beee7a6f90b048d09c0321b
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions