summaryrefslogtreecommitdiffstats
path: root/config.tests/glx
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-24 09:58:43 +0300
committerJørgen Lind <jorgen.lind@gmail.com>2012-09-25 13:41:54 +0200
commitd82863a87157ba901a5076e5f5639189d6177e41 (patch)
treea93c1e0bbaf52563c9ac1749d96b441a47271f1d /config.tests/glx
parent2c84a9c05244735f5e5ce2147398263048cc117e (diff)
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: Ie65cbe0c622780d2f0672bce19d267d1167620ff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Diffstat (limited to 'config.tests/glx')
-rw-r--r--config.tests/glx/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/config.tests/glx/main.cpp b/config.tests/glx/main.cpp
index 589b6c077..298b820ca 100644
--- a/config.tests/glx/main.cpp
+++ b/config.tests/glx/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Compositor.
**
@@ -17,10 +17,10 @@
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT