diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:47:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 10:47:04 +0200 |
| commit | beac0b2e3ea4b292f0473c00bcf68d75360f89ef (patch) | |
| tree | 099c0406f04240a391206b8e671be8cfa2714fe0 /LICENSE.GPLv2 | |
| parent | 9d4827207167a2eeab5e6df5dbcdfe12c5e9d6a1 (diff) | |
| parent | 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I53d801a88bda3a8b8519b6002e1d37053c03e103
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 6dbb032f..a4244777 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. ------------------------------------------------------------------------- |