diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:13:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:13:49 +0200 |
commit | 38d830d00fc2f8c196d736094448e55623e4b35e (patch) | |
tree | b0d11df1e0d5adfaf3f8e0bf64ff09c887c0a339 /LICENSE.LGPLv21 | |
parent | a6d4f7e2fce89807e3e92fd945d99722ce893b2b (diff) | |
parent | e66dcd51d0e5517e88cd59912fd08501522a2902 (diff) | |
download | qtwebsockets-38d830d00fc2f8c196d736094448e55623e4b35e.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ie37e1ec038e82c845066f92e5f87e355d627e2ff
Diffstat (limited to 'LICENSE.LGPLv21')
-rw-r--r-- | LICENSE.LGPLv21 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e18461..dfcab5e 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -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 2.1, which is displayed below. ------------------------------------------------------------------------- |