diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
| commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
| tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /doc/src/images | |
| parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
| parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
| download | Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.zip Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.gz Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/gestures.png | bin | 0 -> 178365 bytes |
| -rw-r--r-- | doc/src/images/video-videographicsitem.png | bin | 0 -> 54436 bytes |
| -rw-r--r-- | doc/src/images/video-videowidget.png | bin | 0 -> 54199 bytes |
| -rw-r--r-- | doc/src/images/whatsnewanimatedtiles.png | bin | 0 -> 168909 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/gestures.png b/doc/src/images/gestures.png Binary files differnew file mode 100644 index 0000000..6bc5632 --- /dev/null +++ b/doc/src/images/gestures.png diff --git a/doc/src/images/video-videographicsitem.png b/doc/src/images/video-videographicsitem.png Binary files differnew file mode 100644 index 0000000..e333c54 --- /dev/null +++ b/doc/src/images/video-videographicsitem.png diff --git a/doc/src/images/video-videowidget.png b/doc/src/images/video-videowidget.png Binary files differnew file mode 100644 index 0000000..a3c7bcb --- /dev/null +++ b/doc/src/images/video-videowidget.png diff --git a/doc/src/images/whatsnewanimatedtiles.png b/doc/src/images/whatsnewanimatedtiles.png Binary files differnew file mode 100644 index 0000000..7152ee2 --- /dev/null +++ b/doc/src/images/whatsnewanimatedtiles.png |
