diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-05 08:14:27 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-05 12:38:01 +0100 |
| commit | 88ab82b283fcb7e5805819ea18dc8d22b035b7bf (patch) | |
| tree | e995cfa6e9f5351f75d7cb11f87e8b3a5db83d40 /.gitattributes | |
| parent | 2a8675cdbcc3e064069b6f1878fe1c1ce736653c (diff) | |
| parent | 939150289d13b40882f7247d05213a0418076810 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I254cc725505349e73c7abc290afc7abb85156997
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions