diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-16 17:03:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-16 17:03:16 +0200 |
| commit | b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a (patch) | |
| tree | 0e6fbb0f1bdd624f52588022a69ce9bf80447249 /LICENSE.GPL3-EXCEPT | |
| parent | 368b24bfa00a5ef8fe14cd5e4690333675d7704a (diff) | |
| parent | 1673dbed00ba68209b6de95981f1e3b4a2a24682 (diff) | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ib23a0c24c0ec5758dd0799a443c5e43ce7c5f35b
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions