diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-10-02 06:40:17 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-10-02 06:40:17 (GMT) |
| commit | 17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690 (patch) | |
| tree | ee9a982c144fb636ec22cdf7dd27de37725ff320 /doc/src/images | |
| parent | b148b182b5b48d60c2b57d8b74ad0f30272bb578 (diff) | |
| parent | 7ea326d796a6d2ecb13b961c576c82a797d84706 (diff) | |
| download | Qt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.zip Qt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.tar.gz Qt-17dc26e3e7a65b6eb0c0980a76c8fbe7bd37c690.tar.bz2 | |
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/gradient.png | bin | 0 -> 222 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-bloom.png | bin | 0 -> 79982 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-effects.png | bin | 395669 -> 486123 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-plain.png | bin | 0 -> 68763 bytes |
| -rw-r--r-- | doc/src/images/pbuffers-example.png | bin | 203754 -> 192554 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/gradient.png b/doc/src/images/gradient.png Binary files differnew file mode 100644 index 0000000..2ef36ed --- /dev/null +++ b/doc/src/images/gradient.png diff --git a/doc/src/images/graphicseffect-bloom.png b/doc/src/images/graphicseffect-bloom.png Binary files differnew file mode 100644 index 0000000..dace7eb --- /dev/null +++ b/doc/src/images/graphicseffect-bloom.png diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png Binary files differindex 3709014..609bef9 100644 --- a/doc/src/images/graphicseffect-effects.png +++ b/doc/src/images/graphicseffect-effects.png diff --git a/doc/src/images/graphicseffect-plain.png b/doc/src/images/graphicseffect-plain.png Binary files differnew file mode 100644 index 0000000..8b4c1c4 --- /dev/null +++ b/doc/src/images/graphicseffect-plain.png diff --git a/doc/src/images/pbuffers-example.png b/doc/src/images/pbuffers-example.png Binary files differindex bafb05a..c34a6fd 100644 --- a/doc/src/images/pbuffers-example.png +++ b/doc/src/images/pbuffers-example.png |
