diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 03:47:42 (GMT) |
| commit | 350b0fadf3fbd12a278681513295577a066b0fb1 (patch) | |
| tree | f0ebad6693c3cf3b7754fb8187a6b320e5d4679f /examples/network/loopback | |
| parent | e4625e53aa893f7c59407913e743951294c7dafe (diff) | |
| parent | 9d636095403f5abecbdff8ffffe658f35ff10001 (diff) | |
| download | Qt-350b0fadf3fbd12a278681513295577a066b0fb1.zip Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.gz Qt-350b0fadf3fbd12a278681513295577a066b0fb1.tar.bz2 | |
Merge commit 'origin/4.6' into bearermanagement/integration-4
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
Diffstat (limited to 'examples/network/loopback')
| -rw-r--r-- | examples/network/loopback/dialog.cpp | 2 | ||||
| -rw-r--r-- | examples/network/loopback/dialog.h | 2 | ||||
| -rw-r--r-- | examples/network/loopback/main.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp index 3bca094..27cff31 100644 --- a/examples/network/loopback/dialog.cpp +++ b/examples/network/loopback/dialog.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/network/loopback/dialog.h b/examples/network/loopback/dialog.h index 98bdb8e..c2c1807 100644 --- a/examples/network/loopback/dialog.h +++ b/examples/network/loopback/dialog.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/network/loopback/main.cpp b/examples/network/loopback/main.cpp index 56d0b2b..d746700 100644 --- a/examples/network/loopback/main.cpp +++ b/examples/network/loopback/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) ** |