diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-04 22:53:42 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-04 22:53:42 (GMT) |
commit | 276857a52db4640095ede5e7840fabb451b97b85 (patch) | |
tree | dd8f26f85583a99b411bbcd6e5ceb4d280ff4af9 /doc/src/images | |
parent | c76bb1dcda7b0339d9de427d155b593b3779bea7 (diff) | |
parent | 34a1438c4184afecc237fe0177ed4a536b2d5e43 (diff) | |
download | Qt-276857a52db4640095ede5e7840fabb451b97b85.zip Qt-276857a52db4640095ede5e7840fabb451b97b85.tar.gz Qt-276857a52db4640095ede5e7840fabb451b97b85.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
Diffstat (limited to 'doc/src/images')
-rw-r--r-- | doc/src/images/xml-schema.png | bin | 0 -> 48931 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/xml-schema.png b/doc/src/images/xml-schema.png Binary files differnew file mode 100644 index 0000000..b1bcecc --- /dev/null +++ b/doc/src/images/xml-schema.png |