summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlinecontrol.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-01-14 11:18:28 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-01-14 11:18:28 (GMT)
commit2ac0b4390164e7d92b53b0b0f55a82a9a054ee91 (patch)
treec57977b39f0a27961d1c9307f1a8bda40eb49695 /src/gui/widgets/qlinecontrol.cpp
parenta299057a351b0aff2c961e920839451b67e50f4e (diff)
parent9baeb2fc297a7a30bb467ea0d1986c7fecea2e58 (diff)
downloadQt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.zip
Qt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.tar.gz
Qt-2ac0b4390164e7d92b53b0b0f55a82a9a054ee91.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/widgets/qlinecontrol.cpp')
-rw-r--r--src/gui/widgets/qlinecontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 12b4268..414c2ed 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.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)
**