diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-26 15:58:06 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-26 15:58:06 (GMT) |
| commit | 834c8617dc130126c0ce5213bda36b9f62717b1e (patch) | |
| tree | 129006ab4b0cc446dd5ea58f9c160f5681490bed /doc/src/images | |
| parent | c5bd324a9216e37e907e9c85c0fe96b58772eaa2 (diff) | |
| parent | d3bf6e227b353c10de3353b6072640dea59b52c0 (diff) | |
| download | Qt-834c8617dc130126c0ce5213bda36b9f62717b1e.zip Qt-834c8617dc130126c0ce5213bda36b9f62717b1e.tar.gz Qt-834c8617dc130126c0ce5213bda36b9f62717b1e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/images')
| -rwxr-xr-x | doc/src/images/audiodevices-example.png | bin | 0 -> 25856 bytes |
| -rw-r--r-- | doc/src/images/audioinput-example.png | bin | 0 -> 10383 bytes |
| -rwxr-xr-x | doc/src/images/audiooutput-example.png | bin | 0 -> 11966 bytes |
| -rw-r--r-- | doc/src/images/combowidgetmapper-example.png (renamed from doc/src/images/combo-widget-mapper.png) | bin | 10801 -> 10801 bytes |
| -rw-r--r-- | doc/src/images/qmediaplayer-demo.png (renamed from doc/src/images/mediaplayer-demo.png) | bin | 12868 -> 12868 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png Binary files differnew file mode 100755 index 0000000..ae857df --- /dev/null +++ b/doc/src/images/audiodevices-example.png diff --git a/doc/src/images/audioinput-example.png b/doc/src/images/audioinput-example.png Binary files differnew file mode 100644 index 0000000..fb703e6 --- /dev/null +++ b/doc/src/images/audioinput-example.png diff --git a/doc/src/images/audiooutput-example.png b/doc/src/images/audiooutput-example.png Binary files differnew file mode 100755 index 0000000..5588fbb --- /dev/null +++ b/doc/src/images/audiooutput-example.png diff --git a/doc/src/images/combo-widget-mapper.png b/doc/src/images/combowidgetmapper-example.png Binary files differindex 910d6ed..910d6ed 100644 --- a/doc/src/images/combo-widget-mapper.png +++ b/doc/src/images/combowidgetmapper-example.png diff --git a/doc/src/images/mediaplayer-demo.png b/doc/src/images/qmediaplayer-demo.png Binary files differindex 2c1f9b4..2c1f9b4 100644 --- a/doc/src/images/mediaplayer-demo.png +++ b/doc/src/images/qmediaplayer-demo.png |
