diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:21:56 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:22:16 (GMT) |
| commit | f62e846c7ebe243a2a36e7577d070f1275f2ec47 (patch) | |
| tree | 0cbfa6cd832b6f20ea699e8f172b1b3afe96b2c2 /tools/qtconfig | |
| parent | 6a8beac59f5824e1fc826f513495fbb8478b79ce (diff) | |
| parent | d2b05885a28aafa331b25cdf3b647b782605df08 (diff) | |
| download | Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.zip Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.gz Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.bz2 | |
Merge earth-team into origin/master'
Diffstat (limited to 'tools/qtconfig')
| -rw-r--r-- | tools/qtconfig/paletteeditoradvanced.ui | 2 | ||||
| -rw-r--r-- | tools/qtconfig/previewwidget.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qtconfig/paletteeditoradvanced.ui b/tools/qtconfig/paletteeditoradvanced.ui index b1d6b95..0b4ae66 100644 --- a/tools/qtconfig/paletteeditoradvanced.ui +++ b/tools/qtconfig/paletteeditoradvanced.ui @@ -2,7 +2,7 @@ <ui version="4.0"> <comment>********************************************************************* ** -** 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) ** diff --git a/tools/qtconfig/previewwidget.ui b/tools/qtconfig/previewwidget.ui index 2e0789f..fac4b6c 100644 --- a/tools/qtconfig/previewwidget.ui +++ b/tools/qtconfig/previewwidget.ui @@ -2,7 +2,7 @@ <ui version="4.0"> <comment>********************************************************************* ** -** 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) ** |