diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:22:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:24:12 +0100 |
| commit | ec316b3b7973efa3f2d2af211b95bc8b45b42a50 (patch) | |
| tree | b3f0445661ccddb4d11a6a90cf944400205edfd8 /src/multimedia/doc/src/images | |
| parent | c2736c3a629d944818c44db9ad69beffb872bdd5 (diff) | |
| parent | 6902c5d770bfa79522d4349215c0b582642c7594 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f
Diffstat (limited to 'src/multimedia/doc/src/images')
| -rw-r--r-- | src/multimedia/doc/src/images/video-qml-paint-rate.png | bin | 0 -> 6350 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/multimedia/doc/src/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png Binary files differnew file mode 100644 index 000000000..1519ff64e --- /dev/null +++ b/src/multimedia/doc/src/images/video-qml-paint-rate.png |
