diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-15 09:07:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-15 09:07:48 +0200 |
| commit | b3eba26e6f1de63b1de39e1895eb081b45250325 (patch) | |
| tree | 55dea47c2ed0fd261ce76031aebd7123e236a125 /LICENSE.LGPLv3 | |
| parent | a64dcb7416fd5c0100ad176adf26f30b826cbfd6 (diff) | |
| parent | a727ee0b2f1044ad8d5689208aed3f469b8de1ba (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/client/qwaylandintegration.cpp
Change-Id: I29120f06d33c2d383a41cf35ca4a59f5d8548ad7
Diffstat (limited to 'LICENSE.LGPLv3')
| -rw-r--r-- | LICENSE.LGPLv3 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 8fbb74390..4d67bac0b 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -5,6 +5,8 @@ You may use, distribute and copy the Qt GUI 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. ------------------------------------------------------------------------- |