diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-18 12:00:07 +0200 |
| commit | 2068af50ca9eb8895e34cb60f67942e100c60432 (patch) | |
| tree | 31c5f51e2bcb74b660fe4013f29c417e71215012 /LICENSE.LGPLv3 | |
| parent | 1d3966833b5f27fb262f2d3727557ef2c8947828 (diff) | |
| parent | 2ebfdb4ca80f6738c2720cb261c19fecd65b8b62 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitmodules
qtquickcontrols2
qtwebview
Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
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 8fbb7439..4d67bac0 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. ------------------------------------------------------------------------- |