diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:43:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:43:57 +0100 |
| commit | a002116ece257e2a2a1e6047c43652073806917e (patch) | |
| tree | 867861b57eb36a2765767f1b714cbbfc86017040 /.qmake.conf | |
| parent | 97399982e325d0376d599f7595abd48d49364058 (diff) | |
| parent | 84b13fd9fcd85d39411150f8ae46916a048c413c (diff) | |
| download | qtscript-a002116ece257e2a2a1e6047c43652073806917e.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ia28ef49b2f708a4af918c3ff22655ed65a0249c0
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions