diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:29:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:29:47 +0200 |
| commit | 32c3d9bb5a8825296cdfc92ffeeb44f74efbb638 (patch) | |
| tree | dd1af3d7da1c64caac6d3b7c3f21c06e89477714 /LICENSE.GPLv3 | |
| parent | 5bc48a4443b5b4a3ab2e20c6c839305f698946ed (diff) | |
| parent | 38d830d00fc2f8c196d736094448e55623e4b35e (diff) | |
| download | qtwebsockets-32c3d9bb5a8825296cdfc92ffeeb44f74efbb638.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1
Diffstat (limited to 'LICENSE.GPLv3')
| -rw-r--r-- | LICENSE.GPLv3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b12..71c4ad4 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -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 Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. |