diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 10:39:21 (GMT) |
| commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
| tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /src/opengl/util/generator.cpp | |
| parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | Qt-3aca005d4721b82446922310496271ebe206a0d7.zip Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.gz Qt-3aca005d4721b82446922310496271ebe206a0d7.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'src/opengl/util/generator.cpp')
| -rw-r--r-- | src/opengl/util/generator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp index 0202fe1..e0148b2 100644 --- a/src/opengl/util/generator.cpp +++ b/src/opengl/util/generator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -287,7 +287,7 @@ void writeIncludeFile(const QSet<QString> &variables, out << "/****************************************************************************\n" "**\n" - "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n" + "** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\n" "** All rights reserved.\n" "** Contact: Nokia Corporation (qt-info@nokia.com)\n" "**\n" |