summaryrefslogtreecommitdiffstats
path: root/doc/src/images
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-22 16:50:30 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-22 16:50:30 (GMT)
commitd9ab330f613bd2c921ba00ed36b6eea8927aec80 (patch)
tree8a5337dac7617fe8e654fd4ffd1302c587967c76 /doc/src/images
parentdacc8cb0b2abd5ec3e9603c9bcf5b8f489639404 (diff)
parent701bdcbc8b7751834f6d24844bcb91a23cbdc409 (diff)
downloadQt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.zip
Qt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.tar.gz
Qt-d9ab330f613bd2c921ba00ed36b6eea8927aec80.tar.bz2
Merge branch '4.5'
Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
Diffstat (limited to 'doc/src/images')
-rw-r--r--doc/src/images/inputdialogs.pngbin4244 -> 30369 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/inputdialogs.png b/doc/src/images/inputdialogs.png
index 135c2f6..8bda185 100644
--- a/doc/src/images/inputdialogs.png
+++ b/doc/src/images/inputdialogs.png
Binary files differ