diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:10:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 16:10:02 +0200 |
| commit | 77c5d38325e35660be86e0bde3c18a7e2180ccf9 (patch) | |
| tree | a700928781f46bd60404260dbe13b339fbe7b5fe /LICENSE.GPL2 | |
| parent | c3edc76d7c621ddd9015eb9992415be34cf36112 (diff) | |
| parent | 3960f026b770ce416a996d70a62acdc586c4fe56 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I6ab9e89b0a89d5843da5eb43b62b5d32dc8c9ac7
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions