summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/brushstyles
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-22 08:07:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-22 08:07:37 (GMT)
commit26b07492710de0551bb21d7fd1e7767d5093cf7d (patch)
treef573faff3b90cb3c3c9d848bdf2e377825eac090 /doc/src/snippets/brushstyles
parentd1f77a5e47d79b9fb688046a7357bc0c8b21c875 (diff)
parent52c040be74bc705fa50eda88bac275a6bd1645a8 (diff)
downloadQt-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