diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 01:00:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-03-15 11:20:40 +0100 |
| commit | 67cc0be410e0325ff5c8757684cacd02eea91572 (patch) | |
| tree | d41a8a73b6792e6ebd70b94cd439d6b33bdcadda /.gitattributes | |
| parent | 662c53dc583188d0278c86f59ab6b80056dbd419 (diff) | |
| parent | f10ac43ebb839b61315bd3b370b77683b625e4c4 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
Change-Id: I604517d0948fb5056ce36cc104f13ac956fbcc24
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions