diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-07-28 08:55:43 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-07-28 08:55:43 (GMT) |
| commit | baaa236128d89f7fcbd63fb14eeacdabd3d64d71 (patch) | |
| tree | 4132d435f6bf64a5e6d049c76eeb9604db47a8cc /doc/src/images | |
| parent | 583d68c72ae58c1b35c2ffba733b7e68a32dc2f9 (diff) | |
| parent | 354bd0287c4178cbf512f10b5624a84c99e1d606 (diff) | |
| download | Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.zip Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.tar.gz Qt-baaa236128d89f7fcbd63fb14eeacdabd3d64d71.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/touch-dials-example.png (renamed from doc/src/images/multitouch-dials-example.png) | bin | 17676 -> 17676 bytes |
| -rw-r--r-- | doc/src/images/touch-examples.png (renamed from doc/src/images/multitouch-examples.png) | bin | 6691 -> 6691 bytes |
| -rw-r--r-- | doc/src/images/touch-fingerpaint-example.png (renamed from doc/src/images/multitouch-fingerpaint-example.png) | bin | 17026 -> 17026 bytes |
| -rw-r--r-- | doc/src/images/touch-knobs-example.png (renamed from doc/src/images/multitouch-knobs-example.png) | bin | 1290 -> 1290 bytes |
| -rw-r--r-- | doc/src/images/touch-pinchzoom-example.png (renamed from doc/src/images/multitouch-pinchzoom-example.png) | bin | 48154 -> 48154 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/multitouch-dials-example.png b/doc/src/images/touch-dials-example.png Binary files differindex 60e1776..60e1776 100644 --- a/doc/src/images/multitouch-dials-example.png +++ b/doc/src/images/touch-dials-example.png diff --git a/doc/src/images/multitouch-examples.png b/doc/src/images/touch-examples.png Binary files differindex b053cf3..b053cf3 100644 --- a/doc/src/images/multitouch-examples.png +++ b/doc/src/images/touch-examples.png diff --git a/doc/src/images/multitouch-fingerpaint-example.png b/doc/src/images/touch-fingerpaint-example.png Binary files differindex c741b65..c741b65 100644 --- a/doc/src/images/multitouch-fingerpaint-example.png +++ b/doc/src/images/touch-fingerpaint-example.png diff --git a/doc/src/images/multitouch-knobs-example.png b/doc/src/images/touch-knobs-example.png Binary files differindex 1cbd90d..1cbd90d 100644 --- a/doc/src/images/multitouch-knobs-example.png +++ b/doc/src/images/touch-knobs-example.png diff --git a/doc/src/images/multitouch-pinchzoom-example.png b/doc/src/images/touch-pinchzoom-example.png Binary files differindex 1079fb2..1079fb2 100644 --- a/doc/src/images/multitouch-pinchzoom-example.png +++ b/doc/src/images/touch-pinchzoom-example.png |
