summaryrefslogtreecommitdiffstats
path: root/LGPL_EXCEPTION.txt
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-25 12:31:19 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-29 07:57:45 +0200
commit619136931e2c985377348d196d488e429a4858d6 (patch)
tree627b1197a7888451c26df27dcd3b0d1e34c127ce /LGPL_EXCEPTION.txt
parent14dabf0f354b4f3817393d9b9e52473f88b896da (diff)
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'LGPL_EXCEPTION.txt')
-rw-r--r--LGPL_EXCEPTION.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt
index 8f73eca773..add80b9318 100644
--- a/LGPL_EXCEPTION.txt
+++ b/LGPL_EXCEPTION.txt
@@ -1,10 +1,10 @@
-Nokia Qt LGPL Exception version 1.1
+Digia Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
- (i) the header files of the Library have not been modified; and
+ (i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and