diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:32:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 13:14:05 +0200 |
| commit | 8fa108de666e815053c6e586f1efabc592ae20a5 (patch) | |
| tree | 6e9418f38cd884a7a204d7c0e1ec10c871c37346 /LICENSE.LGPLv3 | |
| parent | b2dcacddabb5bcfbc031a0681a0e90996092a506 (diff) | |
| parent | 10967b1443720116744ecfc42fe442681d149c5a (diff) | |
| download | qtserialport-8fa108de666e815053c6e586f1efabc592ae20a5.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
src/serialport/qserialport.cpp
Change-Id: I858fec6e426f5fd867b7eda7b1db69a2d447b357
Diffstat (limited to 'LICENSE.LGPLv3')
| -rw-r--r-- | LICENSE.LGPLv3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac..6bf924c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -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, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. |