diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:19:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:19:02 +0100 |
commit | 39bd69edcc373465bc11077140993058c18ee4a0 (patch) | |
tree | 21fea163de8db08c6e07185f03d8e4ebad533790 /.qmake.conf | |
parent | 5e9053c3232e814a0e1cdbb115e00066107be1ba (diff) | |
parent | 24f802dc02176d8f50d77be58b872ad525ed1a52 (diff) | |
download | qtx11extras-39bd69edcc373465bc11077140993058c18ee4a0.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Iefeabec872d521c5788b6cde315ae87bd1c1140a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions