summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-12 19:39:11 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-12 19:39:11 +1000
commit1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74 (patch)
treeaf7971ca725efcf14aedea07c933338e5c89581c /src/plugins
parent502c4d7e000e6accf4f86b28459a83c7c7763057 (diff)
parent41bb458f095bf796d3a083eaa1c9d547f3fed745 (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Migrate addMarkUp function to QChar.
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions