summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglfunctions.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2011-03-24 09:27:07 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2011-03-24 09:27:07 (GMT)
commitce80b75964ba5b1071112eb9bc04977da8079b23 (patch)
treee6fc4154aecc3581b9720d2f4482e97f3ecb3f49 /src/opengl/qglfunctions.cpp
parentfdeeaa9d61efea9cca783a1d4098ae505df24390 (diff)
parent295fbcba490712fe6e6f61926836920366134b55 (diff)
downloadQt-ce80b75964ba5b1071112eb9bc04977da8079b23.zip
Qt-ce80b75964ba5b1071112eb9bc04977da8079b23.tar.gz
Qt-ce80b75964ba5b1071112eb9bc04977da8079b23.tar.bz2
Merge branch 'master-upstream'
Diffstat (limited to 'src/opengl/qglfunctions.cpp')
-rw-r--r--src/opengl/qglfunctions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp
index 8a544c1..29e32ff 100644
--- a/src/opengl/qglfunctions.cpp
+++ b/src/opengl/qglfunctions.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**