diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:38 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:38 +0200 |
| commit | bfbc454082e593764ad28f76aa768b67f0d42ffc (patch) | |
| tree | c842d6f776a91b6533e8c79a82e1d3374d6398cc | |
| parent | 19359608b5796d4351d6d29215753f456c8d5fa7 (diff) | |
| parent | 84138b2d18a3afc69997f29d1efcce1b7cc4d1ae (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I20a98a6239fc57a67e0b83dbb124d711676600e7
0 files changed, 0 insertions, 0 deletions