diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:07:23 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 12:03:11 +0200 |
| commit | f4062a8ee0bc37f4df5829b89684556dd8acc37b (patch) | |
| tree | 5f6a79a783e81a23f8231a8872a95f84eee47843 | |
| parent | 2a88e88608eee393e23884c01aaa4ee3082a0ca3 (diff) | |
| parent | b7a622cac9a5de26cd61203ee6dda6105826d293 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: Icd3e95b0a343464a133ced6e14ac012b19500aa1
0 files changed, 0 insertions, 0 deletions