diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-17 09:35:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-17 09:35:23 (GMT) |
| commit | 1e179f6c0279adefc20924731b6e8378a89131de (patch) | |
| tree | 1ce899307c51f03a73c7093477e829ae4091da78 /util/unicode | |
| parent | 6c52715202ad8fd3c3f4bb94207cb7627c12f995 (diff) | |
| parent | 4631d297781b8ad4eba0735b7023265d4872c1cb (diff) | |
| download | Qt-1e179f6c0279adefc20924731b6e8378a89131de.zip Qt-1e179f6c0279adefc20924731b6e8378a89131de.tar.gz Qt-1e179f6c0279adefc20924731b6e8378a89131de.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'util/unicode')
| -rw-r--r-- | util/unicode/codecs/big5/main.cpp | 2 | ||||
| -rw-r--r-- | util/unicode/main.cpp | 4 | ||||
| -rwxr-xr-x | util/unicode/writingSystems.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/util/unicode/codecs/big5/main.cpp b/util/unicode/codecs/big5/main.cpp index 3e0ef12..1f1b5cf 100644 --- a/util/unicode/codecs/big5/main.cpp +++ b/util/unicode/codecs/big5/main.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) ** diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index ccb238b..3384e62 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.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) ** @@ -2646,7 +2646,7 @@ int main(int, char **) QByteArray header = "/****************************************************************************\n" "**\n" - "** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\n" + "** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).\n" "** All rights reserved.\n" "** Contact: Nokia Corporation (qt-info@nokia.com)\n" "**\n" diff --git a/util/unicode/writingSystems.sh b/util/unicode/writingSystems.sh index f675aba..f787181 100755 --- a/util/unicode/writingSystems.sh +++ b/util/unicode/writingSystems.sh @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## 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) ## |