summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlayout/tst_qlayout.cpp
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2011-01-20 10:38:03 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2011-01-20 10:38:03 (GMT)
commitef998bca70a799806c5754edfa49ea625881bc3e (patch)
tree2f1ec89d331283cfe53c0cdf5e287683960953e0 /tests/auto/qlayout/tst_qlayout.cpp
parent43f8762367fa6ffc228ae6e97192766475b02ac0 (diff)
parent78a927cd7b93ae3fadd272cab9ee594a1369cea4 (diff)
downloadQt-ef998bca70a799806c5754edfa49ea625881bc3e.zip
Qt-ef998bca70a799806c5754edfa49ea625881bc3e.tar.gz
Qt-ef998bca70a799806c5754edfa49ea625881bc3e.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'tests/auto/qlayout/tst_qlayout.cpp')
-rw-r--r--tests/auto/qlayout/tst_qlayout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index a974a42..65eae55 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.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)
**