diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:38:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:39:16 +0100 |
| commit | 3e28d47cea038ca64c2e14ff449cc183c51643ce (patch) | |
| tree | 759b46b0d22df284b139f23d63989790fbea7246 | |
| parent | 8658266498ecc98f7d73486746ad8a27368c7974 (diff) | |
| parent | 8e86608f28b168b6a0e7ee5dbd56ec7d2e55b09b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I8117f5f5982fdf7954d0510fcad10adc6e00bd20
0 files changed, 0 insertions, 0 deletions