diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-08 07:38:29 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-08 07:38:29 (GMT) |
| commit | 2b66a299baef677df027c1530764c6d4b201d166 (patch) | |
| tree | a420bba8e3a44c6394820a2bb84bef7e782fcc09 /doc/src/snippets/code/src_gui_image_qbitmap.cpp | |
| parent | b416be48930ed52bad15fa220142f9228e82bcf8 (diff) | |
| parent | 75eba69aed3a9b73d29e91c1f5b5463654321bea (diff) | |
| download | Qt-2b66a299baef677df027c1530764c6d4b201d166.zip Qt-2b66a299baef677df027c1530764c6d4b201d166.tar.gz Qt-2b66a299baef677df027c1530764c6d4b201d166.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/advtutorial4.qdoc
Diffstat (limited to 'doc/src/snippets/code/src_gui_image_qbitmap.cpp')
0 files changed, 0 insertions, 0 deletions