diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
| commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
| tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /doc/src/images | |
| parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
| parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
| download | Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/browser-demo.png | bin | 157205 -> 144715 bytes |
| -rw-r--r-- | doc/src/images/gestures-examples.png | bin | 0 -> 28873 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/browser-demo.png b/doc/src/images/browser-demo.png Binary files differindex 466f218..5e0c0be 100644 --- a/doc/src/images/browser-demo.png +++ b/doc/src/images/browser-demo.png diff --git a/doc/src/images/gestures-examples.png b/doc/src/images/gestures-examples.png Binary files differnew file mode 100644 index 0000000..d4a006b --- /dev/null +++ b/doc/src/images/gestures-examples.png |
