diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:55:49 +0100 |
| commit | 071b8def29e9b5af76f2f60a3f4569c746e5a39c (patch) | |
| tree | 4b430c25ba7a150702ec76471df29be9ce8fcc72 /LICENSE.LGPL3 | |
| parent | ec2c0f4db6350a304dcf901b9adbadc895864c14 (diff) | |
| parent | f21ef0cd01ccf1ccdbb2211eb935aff402741969 (diff) | |
| download | qtx11extras-071b8def29e9b5af76f2f60a3f4569c746e5a39c.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ie24e49d8396394f78f98367ad3485d2540ba3156
Diffstat (limited to 'LICENSE.LGPL3')
0 files changed, 0 insertions, 0 deletions