diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 08:07:37 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-22 08:07:37 (GMT) |
commit | 26b07492710de0551bb21d7fd1e7767d5093cf7d (patch) | |
tree | f573faff3b90cb3c3c9d848bdf2e377825eac090 /doc/src/snippets/brushstyles | |
parent | d1f77a5e47d79b9fb688046a7357bc0c8b21c875 (diff) | |
parent | 52c040be74bc705fa50eda88bac275a6bd1645a8 (diff) | |
download | Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.zip Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.tar.gz Qt-26b07492710de0551bb21d7fd1e7767d5093cf7d.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant docs: Fix link.
QtHelp docs: Fix illegal namespace name.
Assistant: Set correct mime type for text documents.
Diffstat (limited to 'doc/src/snippets/brushstyles')
0 files changed, 0 insertions, 0 deletions