diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
| commit | cb800de1f42aaacdeb423d30adbcbf8975e32f2f (patch) | |
| tree | 7493c2b814c5f3c780fc7338c62660846fdb6e92 /LICENSE.GPLv3 | |
| parent | 14f86268e7f149a3c881203227321c3fd085e4d9 (diff) | |
| parent | eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
Diffstat (limited to 'LICENSE.GPLv3')
0 files changed, 0 insertions, 0 deletions