diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-01-14 11:18:28 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-01-14 11:18:28 (GMT) |
| commit | 2ac0b4390164e7d92b53b0b0f55a82a9a054ee91 (patch) | |
| tree | c57977b39f0a27961d1c9307f1a8bda40eb49695 /src/gui/widgets/qlabel.h | |
| parent | a299057a351b0aff2c961e920839451b67e50f4e (diff) | |
| parent | 9baeb2fc297a7a30bb467ea0d1986c7fecea2e58 (diff) | |
| download | Qt-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/qlabel.h')
| -rw-r--r-- | src/gui/widgets/qlabel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlabel.h b/src/gui/widgets/qlabel.h index e3b6587..d916078 100644 --- a/src/gui/widgets/qlabel.h +++ b/src/gui/widgets/qlabel.h @@ -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) ** |