diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 14:17:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 15:02:38 +0100 |
| commit | 99a33c4c4a214fc14e3fafc3349f01b5d208f403 (patch) | |
| tree | ab207c8c9fec2e990acbda93417961568ad15b13 /examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png | |
| parent | 4c8f2c3b376186a2620bd3b879f4e5970239ac2f (diff) | |
| parent | 1faaf0d1e580b158971fd21c9881676ae5e7ed1e (diff) | |
| download | qtwebkit-examples-99a33c4c4a214fc14e3fafc3349f01b5d208f403.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ib872687957e2de85267a0415209a58a733c41c24
Diffstat (limited to 'examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png')
| -rw-r--r-- | examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png | bin | 0 -> 12218 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png b/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png Binary files differnew file mode 100644 index 0000000..ba93e4d --- /dev/null +++ b/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png |