diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
| commit | 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd (patch) | |
| tree | d5bdef5e9340c64bbcf16115beced802b4170dd8 /.gitattributes | |
| parent | 35c178c310ebb85a8959d116acd913e7c050c8df (diff) | |
| parent | 7e3a5fd664b02a537b7f5dcd73840c5c7a437519 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions