diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:27:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:27:53 +0200 |
commit | 6702506920e61fe7af38222928528553c5a1f167 (patch) | |
tree | 601a4661c4c8c78c80dd46ded8a1dfe0bb3d2678 /LICENSE.LGPLv3 | |
parent | 6b058fbd8be8604d3796a4ae690c85482eb772ca (diff) | |
parent | e32bcb7b714454f9167c4d49776a95c9a5799d70 (diff) | |
download | qtenginio-6702506920e61fe7af38222928528553c5a1f167.tar.gz |
Merge remote-tracking branch 'origin/1.2' into 5.6
Conflicts:
.qmake.conf
Change-Id: Icaade4d6cab13f7b8b7ffc3b8a759effe5aafaf9
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 8fbb743..4d67bac 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. ------------------------------------------------------------------------- |