summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextcontrol.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-09 12:18:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-09 12:18:02 (GMT)
commit62c5bafeec64ef5a81a9011b4cf377b5d1d20653 (patch)
tree989f10f8bbc656544e082400984d012b84f33fb4 /src/gui/text/qtextcontrol.cpp
parent121141af78771be8c2be4778ab0ee64d3d964240 (diff)
parent712b1f400ec0a87e9d6c521c1d14548f7359f038 (diff)
downloadQt-62c5bafeec64ef5a81a9011b4cf377b5d1d20653.zip
Qt-62c5bafeec64ef5a81a9011b4cf377b5d1d20653.tar.gz
Qt-62c5bafeec64ef5a81a9011b4cf377b5d1d20653.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: qmake vcxproj generator: fix XML conversion for build events
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
0 files changed, 0 insertions, 0 deletions