diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 14:58:58 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 14:58:58 (GMT) |
| commit | 851a858fcd28c35dff2ffbeffdb40f7ee69f45b4 (patch) | |
| tree | f76f604982f127af7ef66d904038cdfa705ff3af /src/corelib/concurrent/qtconcurrentmap.cpp | |
| parent | efea248b4b725ca429793874eb168ad4b43c7994 (diff) | |
| parent | c0b24b7ce12387aff6e74b05b4060c61a58d87e0 (diff) | |
| download | Qt-851a858fcd28c35dff2ffbeffdb40f7ee69f45b4.zip Qt-851a858fcd28c35dff2ffbeffdb40f7ee69f45b4.tar.gz Qt-851a858fcd28c35dff2ffbeffdb40f7ee69f45b4.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/painting/svgviewer/files/bubbles.svg
src/corelib/kernel/qobject.cpp
src/network/kernel/qhostinfo.cpp
tests/auto/qhostinfo/tst_qhostinfo.cpp
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentmap.cpp')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qtconcurrentmap.cpp b/src/corelib/concurrent/qtconcurrentmap.cpp index 3fd044d..243921a 100644 --- a/src/corelib/concurrent/qtconcurrentmap.cpp +++ b/src/corelib/concurrent/qtconcurrentmap.cpp @@ -1,4 +1,4 @@ - /**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Nokia Corporation (qt-info@nokia.com) |