summaryrefslogtreecommitdiffstats
path: root/underwater
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-04-03 21:13:50 +0200
committerDavid Boddie <dboddie@trolltech.com>2009-04-03 21:13:50 +0200
commitefeeab564ebc94097f1628809eadef6b1adef05f (patch)
tree79dc08bcf986a563836b996b9b42d5b33112f3f6 /underwater
parent43afcb516bb651b90e49d552c2b324521b7969f3 (diff)
Updated the license headers.
Diffstat (limited to 'underwater')
-rw-r--r--underwater/underwater.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/underwater/underwater.cpp b/underwater/underwater.cpp
index 9416814..4c8a8ed 100644
--- a/underwater/underwater.cpp
+++ b/underwater/underwater.cpp
@@ -1,20 +1,20 @@
/****************************************************************************
**
-** Copyright (C) 2008-2008 Trolltech ASA. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
**
-** This file is part of the Graphics Dojo project on Trolltech Labs.
+** This file is part of the Graphics Dojo project on Qt Labs.
**
** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
+** License version 2.0 or 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of
** this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales@trolltech.com.
+** contact the sales department at qt-sales@nokia.com.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.