diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
| commit | 2eb60d000f3666fc42ba2b7305ca52556497c86a (patch) | |
| tree | 95e1821e89fcbfa5ccaa4bcbd5673127ee801243 /doc/src/images | |
| parent | 9065cdc07a6745fc269d7ec3aba457d48858267c (diff) | |
| parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
| download | Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.zip Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.gz Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/doc.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/rgbController-configure-connection1.png | bin | 29210 -> 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 Binary files differindex 0798184..4e5dcf2 100644 --- a/doc/src/images/rgbController-configure-connection1.png +++ b/doc/src/images/rgbController-configure-connection1.png |
