diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:02:30 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:10:50 +0200 |
| commit | 2768b390143d57ebed662294e67408f0763535c6 (patch) | |
| tree | 5e4247c7d435210cf27ac8865aaae87b1fdc8624 | |
| parent | 3386ffc9bd99d31c9012693e37aa3ce952074773 (diff) | |
| parent | 75ef3b628f2d162dd349bbe24e0809ea87c9e91a (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: If91a203b204f5fedef1ae4fce9f51d2c9fb11a28
0 files changed, 0 insertions, 0 deletions