diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:35 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:45:48 +0200 |
| commit | 64ea49bc5483c4478952678fa3678ffd1fb501c7 (patch) | |
| tree | 2ee6eaedf33546d0df6f6351014b7f73a737454f | |
| parent | b63320b5eb7296699b3ff77bf4befe73e908e04e (diff) | |
| parent | d3ed5bcb3e1a4175d31333db71dbd52443b727c9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Ifdabe76e9d0643c188fbf0d664f0a6d36f15011f
0 files changed, 0 insertions, 0 deletions