diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:18:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 10:18:49 +0100 |
| commit | 12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c (patch) | |
| tree | 6a7312081b98d562c752e33364ddf79e873473cc /.qmake.conf | |
| parent | 5ef0cb41e6f2d426642bfe98875076f41ea54ce0 (diff) | |
| parent | 46170a55710a8cf90650ac641791e199fb066d8f (diff) | |
| download | qtx11extras-12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I2144151d80b976ebd54c4d921a48a5a52c805352
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions