diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
| commit | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (patch) | |
| tree | 42e98a13192f001365aead8c69000db8ee90979a /doc/src/images/qmediaplayer-demo.png | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | a0177c4b9e4566f9d9edcab7b12ed77bfd823590 (diff) | |
| download | Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.zip Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.gz Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Fixing a merge conflict.
Conflicts:
doc/src/overviews.qdoc
Diffstat (limited to 'doc/src/images/qmediaplayer-demo.png')
| -rw-r--r-- | doc/src/images/qmediaplayer-demo.png | bin | 0 -> 12868 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qmediaplayer-demo.png b/doc/src/images/qmediaplayer-demo.png Binary files differnew file mode 100644 index 0000000..2c1f9b4 --- /dev/null +++ b/doc/src/images/qmediaplayer-demo.png |