diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:05 +0200 |
| commit | 858e9b66e53440317bb8d41d7c342f7d28f13788 (patch) | |
| tree | 1e4d8c2835fcecb60540af96a9667aadce35c766 /.gitattributes | |
| parent | 72536fa39c71b32f963322a8aa0c1dee320102fc (diff) | |
| parent | 871a097d0c6e8203f82b398e21dcfd8151bdae27 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I87da2a6655784bcaf76dd73992c8b874853b1fc7
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions