diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:20:39 +0200 |
| commit | 7d00c195c984750b2ec65eb9267ba689178ea584 (patch) | |
| tree | 6807227671d6a342b00e86bfe753c0c2c18cbe83 /sync.profile | |
| parent | 9e475f2f08cd528b773e67a304aa85d8d0d298d8 (diff) | |
| parent | 777204e439c8edd35e021a73cddd80f4c85ef4f5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic691e11af371acfb7706ee218665fb5a9f96a9c3
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions