diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:48:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:48:47 +0100 |
| commit | 7eae66f6693e560b01c03907bfeccb1deac7aed5 (patch) | |
| tree | 5b859609e429c3b94234af292ce9ca108df1c3f9 /.qmake.conf | |
| parent | 39bd69edcc373465bc11077140993058c18ee4a0 (diff) | |
| parent | fcd1d9a09d22619dfae4c1d4f9911e9acce2e893 (diff) | |
| download | qtx11extras-7eae66f6693e560b01c03907bfeccb1deac7aed5.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: If6efef73040c49ac57f448baacc444493cfd6c0a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions