diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 12:01:04 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-04-17 12:01:04 (GMT) |
| commit | 198efeb27e5c2a87d0a2bb6859446cb1faf45ed8 (patch) | |
| tree | e4c99e89cbecd2084a87a8c7a5d4877385fcec1c /doc/src/images | |
| parent | bb2e4df9bee3148e819c98410aa36e22dad95d7a (diff) | |
| parent | e85867003ca1741f378b1f58f4dd9d48577a5d9b (diff) | |
| download | Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.zip Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.gz Qt-198efeb27e5c2a87d0a2bb6859446cb1faf45ed8.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/customtypesending-example.png | bin | 0 -> 13305 bytes |
| -rw-r--r-- | doc/src/images/extension-example.png | bin | 7676 -> 9929 bytes |
| -rw-r--r-- | doc/src/images/extension_more.png | bin | 9309 -> 13523 bytes |
| -rw-r--r-- | doc/src/images/qtransform-representation.png | bin | 17892 -> 17385 bytes |
| -rw-r--r-- | doc/src/images/queuedcustomtype-example.png | bin | 0 -> 44851 bytes |
| -rw-r--r-- | doc/src/images/svggenerator-example.png | bin | 0 -> 11625 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/customtypesending-example.png b/doc/src/images/customtypesending-example.png Binary files differnew file mode 100644 index 0000000..fbc3953 --- /dev/null +++ b/doc/src/images/customtypesending-example.png diff --git a/doc/src/images/extension-example.png b/doc/src/images/extension-example.png Binary files differindex dfaacc0..18fab52 100644 --- a/doc/src/images/extension-example.png +++ b/doc/src/images/extension-example.png diff --git a/doc/src/images/extension_more.png b/doc/src/images/extension_more.png Binary files differindex 2b06809..407af27 100644 --- a/doc/src/images/extension_more.png +++ b/doc/src/images/extension_more.png diff --git a/doc/src/images/qtransform-representation.png b/doc/src/images/qtransform-representation.png Binary files differindex 2608872..883d5dc 100644 --- a/doc/src/images/qtransform-representation.png +++ b/doc/src/images/qtransform-representation.png diff --git a/doc/src/images/queuedcustomtype-example.png b/doc/src/images/queuedcustomtype-example.png Binary files differnew file mode 100644 index 0000000..4399b63 --- /dev/null +++ b/doc/src/images/queuedcustomtype-example.png diff --git a/doc/src/images/svggenerator-example.png b/doc/src/images/svggenerator-example.png Binary files differnew file mode 100644 index 0000000..e7a8e53 --- /dev/null +++ b/doc/src/images/svggenerator-example.png |
