summaryrefslogtreecommitdiffstats
path: root/doc/src/qtopiacore-opengl.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-07-09 16:53:52 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-07-09 16:53:52 (GMT)
commitaa46e5928b8fd97bada814e56134adb23a068b24 (patch)
treedf917faf833909ad09fc1b83ffde3ba9404dfd51 /doc/src/qtopiacore-opengl.qdoc
parentb7c63e3d89006c9795835a79741b8d7a46891f93 (diff)
parent5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (diff)
downloadQt-aa46e5928b8fd97bada814e56134adb23a068b24.zip
Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.gz
Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc/src/qtopiacore-opengl.qdoc')
-rw-r--r--doc/src/qtopiacore-opengl.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/qtopiacore-opengl.qdoc b/doc/src/qtopiacore-opengl.qdoc
index ceaff22..7452592 100644
--- a/doc/src/qtopiacore-opengl.qdoc
+++ b/doc/src/qtopiacore-opengl.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/