diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:27 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:54:19 +0200 |
| commit | 497d3a2f094f2357729e7425572eb0575d42d648 (patch) | |
| tree | fee3d62076d5a70c8d4ac0a8529ec7429420ed67 | |
| parent | f4902877c444eb4beb044714b375e2150e2062c8 (diff) | |
| parent | 169bc0d4531bca679007fabf416ccceeb39d4450 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I747234f6265b70e9652b9b72249a5d1225110007
0 files changed, 0 insertions, 0 deletions