diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:47:33 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:47:33 +0200 |
commit | d926bce841797a88b972ada10f27126a1fa65738 (patch) | |
tree | bdfb26e3a962d26d78682a45e54917ee5fb331cd /.qmake.conf | |
parent | bf39c3ce5524d151532d89efef40ff1a8e25f4c0 (diff) | |
parent | 60f3106b3fe537f1f26230bf0b59525cf98d6789 (diff) |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I762edff7c04d59cc63477525161c7680ff673d5b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions