diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:21:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:21:26 +0200 |
| commit | 8b5cb6185a014eb65150bef11aebdecb6a723aef (patch) | |
| tree | 5b66ad741a783aa151d61694085eab4e02f2064e /LICENSE.GPLv2 | |
| parent | 22dc3a8207cd10a78eefb56fee5ac95d18e02867 (diff) | |
| parent | f536e36e3188903404fac78064ea7872dd8cc0d2 (diff) | |
Merge remote-tracking branch 'origin/5.7' into devv5.8.0-beta1v5.8.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I7b89f06f0c3cc389a79c177e50685bb53157e0a1
Diffstat (limited to 'LICENSE.GPLv2')
| -rw-r--r-- | LICENSE.GPLv2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 6dbb032..a424477 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU General Public License version 2, which is displayed below. ------------------------------------------------------------------------- |