diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
| commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
| tree | dd3dd688eabf504913df465bb1a384521fcafda4 /LICENSE.LGPLv3 | |
| parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
| parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
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. ------------------------------------------------------------------------- |