diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-05-28 12:40:13 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-05-28 12:40:13 +1000 |
| commit | 40d2a1550603b8c3a9a9e1ed7e9c5324a16d9d02 (patch) | |
| tree | abc629dc62d704d59d91d72381c835a4b2185d2e /src/multimedia/qmediaplaylist.cpp | |
| parent | 0ea1388daa28a42b598d4457f7d61a4095bd642b (diff) | |
| parent | a2dbc00bc5904a886776dcde87244ef77d39a64b (diff) | |
Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0
Conflicts:
config.tests/lbt/lbt.pro
configure
configure.bat
dist/changes-1.0.0
doc/src/installation.qdoc
examples/player/player.cpp
plugins/declarative/declarative.pro
plugins/multimedia/symbian/mmf/mmf.pro
plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro
src/multimedia/multimedia.pro
src/multimedia/qvideooutputcontrol.cpp
src/multimedia/video/qimagevideobuffer.cpp
tests/auto/qaudiooutput/wavheader.h
Diffstat (limited to 'src/multimedia/qmediaplaylist.cpp')
| -rw-r--r-- | src/multimedia/qmediaplaylist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp index 17b34d85b5..a7e5d04cec 100644 --- a/src/multimedia/qmediaplaylist.cpp +++ b/src/multimedia/qmediaplaylist.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) ** |