diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
| commit | 9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d (patch) | |
| tree | 22f60abbc45a5ef8e1beab0af8d9980134d914ad /doc/src/images | |
| parent | f792bae5b13ad68f846a2be1f002d8376f2daef8 (diff) | |
| parent | af98f27a847688e53ab1d34b4a9c04bdc63fe3e1 (diff) | |
| download | Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.zip Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.gz Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
doc/src/index.qdoc
doc/src/topics.qdoc
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
tests/auto/auto.pro
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/activeqt-examples.png | bin | 0 -> 6671 bytes |
| -rw-r--r-- | doc/src/images/animation-examples.png | bin | 0 -> 28060 bytes |
| -rw-r--r-- | doc/src/images/dbus-examples.png | bin | 0 -> 6181 bytes |
| -rw-r--r-- | doc/src/images/ipc-examples.png | bin | 0 -> 7727 bytes |
| -rw-r--r-- | doc/src/images/qq-thumbnail.png | bin | 0 -> 27022 bytes |
| -rw-r--r-- | doc/src/images/statemachine-examples.png | bin | 0 -> 3326 bytes |
| -rw-r--r-- | doc/src/images/webkit-examples.png | bin | 26874 -> 19323 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/activeqt-examples.png b/doc/src/images/activeqt-examples.png Binary files differnew file mode 100644 index 0000000..bda8eba --- /dev/null +++ b/doc/src/images/activeqt-examples.png diff --git a/doc/src/images/animation-examples.png b/doc/src/images/animation-examples.png Binary files differnew file mode 100644 index 0000000..bfc5990 --- /dev/null +++ b/doc/src/images/animation-examples.png diff --git a/doc/src/images/dbus-examples.png b/doc/src/images/dbus-examples.png Binary files differnew file mode 100644 index 0000000..6768935 --- /dev/null +++ b/doc/src/images/dbus-examples.png diff --git a/doc/src/images/ipc-examples.png b/doc/src/images/ipc-examples.png Binary files differnew file mode 100644 index 0000000..815aed3 --- /dev/null +++ b/doc/src/images/ipc-examples.png diff --git a/doc/src/images/qq-thumbnail.png b/doc/src/images/qq-thumbnail.png Binary files differnew file mode 100644 index 0000000..295ef13 --- /dev/null +++ b/doc/src/images/qq-thumbnail.png diff --git a/doc/src/images/statemachine-examples.png b/doc/src/images/statemachine-examples.png Binary files differnew file mode 100644 index 0000000..b2ec66e --- /dev/null +++ b/doc/src/images/statemachine-examples.png diff --git a/doc/src/images/webkit-examples.png b/doc/src/images/webkit-examples.png Binary files differindex 55bbd92..23ddf1c 100644 --- a/doc/src/images/webkit-examples.png +++ b/doc/src/images/webkit-examples.png |
