summaryrefslogtreecommitdiffstats
path: root/doc/src/images
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-05-28 12:18:15 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-05-28 12:18:15 (GMT)
commit50576bd26cd5fb1316f0844ab6da76910d124edd (patch)
tree84b6f2103a60e08a3ea8f1ba8d985b33a710792a /doc/src/images
parent27d979b0ea39922e6e2ae3a3cc6a4d45c9c8f0e9 (diff)
parent353afc392b843519023f27753b45b2e6fd9467ff (diff)
downloadQt-50576bd26cd5fb1316f0844ab6da76910d124edd.zip
Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.gz
Qt-50576bd26cd5fb1316f0844ab6da76910d124edd.tar.bz2
Merge branch '4.5'
Conflicts: src/gui/embedded/qkbdtty_qws.cpp
Diffstat (limited to 'doc/src/images')
-rw-r--r--doc/src/images/rgbController-configure-connection1.pngbin29210 -> 23241 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/rgbController-configure-connection1.png b/doc/src/images/rgbController-configure-connection1.png
index 0798184..4e5dcf2 100644
--- a/doc/src/images/rgbController-configure-connection1.png
+++ b/doc/src/images/rgbController-configure-connection1.png
Binary files differ