diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
| commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
| tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /examples/richtext/textobject | |
| parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | qt4-tools-3aca005d4721b82446922310496271ebe206a0d7.tar.gz | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'examples/richtext/textobject')
| -rw-r--r-- | examples/richtext/textobject/main.cpp | 2 | ||||
| -rw-r--r-- | examples/richtext/textobject/svgtextobject.cpp | 2 | ||||
| -rw-r--r-- | examples/richtext/textobject/svgtextobject.h | 2 | ||||
| -rw-r--r-- | examples/richtext/textobject/window.cpp | 2 | ||||
| -rw-r--r-- | examples/richtext/textobject/window.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp index 28fae6dcf0..c8d6fbba9a 100644 --- a/examples/richtext/textobject/main.cpp +++ b/examples/richtext/textobject/main.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) ** diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/richtext/textobject/svgtextobject.cpp index cf0b0ba9c0..f0fa0d306a 100644 --- a/examples/richtext/textobject/svgtextobject.cpp +++ b/examples/richtext/textobject/svgtextobject.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) ** diff --git a/examples/richtext/textobject/svgtextobject.h b/examples/richtext/textobject/svgtextobject.h index e4ecb6f59a..3944bcf223 100644 --- a/examples/richtext/textobject/svgtextobject.h +++ b/examples/richtext/textobject/svgtextobject.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) ** diff --git a/examples/richtext/textobject/window.cpp b/examples/richtext/textobject/window.cpp index f9a96095fc..3ce45e2a73 100644 --- a/examples/richtext/textobject/window.cpp +++ b/examples/richtext/textobject/window.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) ** diff --git a/examples/richtext/textobject/window.h b/examples/richtext/textobject/window.h index 4af83a7365..fb925b886d 100644 --- a/examples/richtext/textobject/window.h +++ b/examples/richtext/textobject/window.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) ** |