diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-20 09:49:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-01-20 09:49:38 (GMT) |
| commit | d7de938ee18192fbf83bb2b08519dd4ed50f04fa (patch) | |
| tree | 4a3742b57fde8d7f91ea3ee830a99f027a58e2a3 /tests/auto/qpixmap | |
| parent | 8721d060a67a01ac891cab9d3d17aacf7373bcf0 (diff) | |
| parent | 92e89ade291877a1146ca3e121fba5f491f61b84 (diff) | |
| download | Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.zip Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.tar.gz Qt-d7de938ee18192fbf83bb2b08519dd4ed50f04fa.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests/auto/qpixmap')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 0d60ed0..8bcd5e8 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.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) ** |