summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib/shared/textpropertyeditor.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-02-24 10:48:32 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-02-24 10:48:32 (GMT)
commite51fda7db531628b54297ae020dda4a5f962d394 (patch)
tree846fa261f80459529235e890ed897cf6186e9351 /tools/designer/src/lib/shared/textpropertyeditor.cpp
parent66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff)
parentc881e33e7e510204fabd061dac08a00b10b432fb (diff)
downloadQt-e51fda7db531628b54297ae020dda4a5f962d394.zip
Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz
Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/designer/src/lib/shared/textpropertyeditor.cpp')
-rw-r--r--tools/designer/src/lib/shared/textpropertyeditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/lib/shared/textpropertyeditor.cpp b/tools/designer/src/lib/shared/textpropertyeditor.cpp
index 881be1c..bc6cbea 100644
--- a/tools/designer/src/lib/shared/textpropertyeditor.cpp
+++ b/tools/designer/src/lib/shared/textpropertyeditor.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)
**