diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:01 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:12:52 +0200 |
| commit | 95af66a2cabfe92d89fab808e3c69f60d00e90b0 (patch) | |
| tree | 4dd072148fb246be7c218aaadb3583ed22308f0f | |
| parent | cc046e7ac58e979f2d0a4f858d71bc90f06783aa (diff) | |
| parent | d7ff4e5827512eeb3624b8e9dbb736e3c2624e92 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I638c8a5fbb61b281b7a1a37394b240c6c53c768f
0 files changed, 0 insertions, 0 deletions