diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:40:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:40:48 +0100 |
| commit | c08e6e8d470ccbf6be845e7b6ce72158812ba623 (patch) | |
| tree | df88848ebbb2751bdbfaa18ca6d50b9ee9a0c38f /.gitattributes | |
| parent | 0d56d37702b0c91578331321a7ccc1eccf20d773 (diff) | |
| parent | e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I97b86fef841d6dd8dbb04243b762bb6bc4980b63
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions