summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-10-14 19:52:20 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-10-14 19:52:20 +0200
commit62ad5cf27a194a09404bab09bdcaa75273055168 (patch)
tree4c5c12f8a4e4ae598d5dfd89c8a67472537ead9e /.gitattributes
parent2eb448ab7c0d84db3243ecc1ce09db333e11cdda (diff)
parent459a6ad0ae963b30c484a14b8cb910a29e1b1dcb (diff)
downloadqtwebchannel-62ad5cf27a194a09404bab09bdcaa75273055168.tar.gz
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I0b933efe65501476b0004afd6f7c36672baa897c
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions