diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:13:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:13:00 +0200 |
| commit | cc270d39bc60ab2ada6d4ae8589239b90ce2df96 (patch) | |
| tree | ee24afdd6f6e31b82dd3fd6d0c37595b373536df /.gitattributes | |
| parent | 1c0b503885cca9e8eccb6f36c2c1771d01a09eb0 (diff) | |
| parent | 672028cd4db918f9dcf4a583b3874607f35958c4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I135ec58950ba88e041d19561353e0946f4a51497
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions