diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:50:23 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-04 18:50:23 +0200 |
| commit | e8b116e793d13204fb00b286becf95d2a933a784 (patch) | |
| tree | 7d94b673694d5c9e7475faeae35f1268e518cca8 /doc/src/declarative/pics/anatomy-component.png | |
| parent | 42f1e22bdfe2fe29f305dbf50e23933b8e1ef8d0 (diff) | |
| parent | a214bb99775e898fd9233b932f08ff91a57fc053 (diff) | |
| download | qt4-tools-e8b116e793d13204fb00b286becf95d2a933a784.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'doc/src/declarative/pics/anatomy-component.png')
| -rw-r--r-- | doc/src/declarative/pics/anatomy-component.png | bin | 16117 -> 4902 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/declarative/pics/anatomy-component.png b/doc/src/declarative/pics/anatomy-component.png Binary files differindex 70ed983d9a..6125b0091c 100644 --- a/doc/src/declarative/pics/anatomy-component.png +++ b/doc/src/declarative/pics/anatomy-component.png |
