diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:24:23 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 21:24:23 +0200 |
| commit | 3836fd7d12777fc53836a72d6542d2fbf2f20ac9 (patch) | |
| tree | ffd8a3d1c82fea142d7b50fb42111ceb1fbc2e1a /LICENSE.GPLv2 | |
| parent | b84f22a3249aa1af46b17e33ac030abb077251bf (diff) | |
| parent | e35346cf70598c47a456946327927643910aa277 (diff) | |
| download | qtwebchannel-3836fd7d12777fc53836a72d6542d2fbf2f20ac9.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Alleged Conflicts:
examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !
Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3
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. ------------------------------------------------------------------------- |