diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:00:51 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:11:26 +0200 |
commit | b474eb62c44c002e1b78bae97dde0bf77b735dce (patch) | |
tree | 7ac9568eb679b14def4b6ba5d46f9643d04de483 | |
parent | b2ea71ba2c09f94ad843698d51f53a94dee10c33 (diff) | |
parent | b888333a425e3a5d52c06e9891440b7c056bdca6 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I4fe048f05e7838a2eded3d63537691381d97cc5d
0 files changed, 0 insertions, 0 deletions