summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-26 11:20:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-26 11:20:58 (GMT)
commit9dcc2de14862da0bba6b74c51ac6e7a5193d4f08 (patch)
tree63dbe850481112641be5f859e7529378f2d731a8 /src/gui/text
parent624e614c0c3852fe24f756280f0fb4d8781704fc (diff)
parentf835a5bcdd75ed8d18dac4de3e68983725c7ea83 (diff)
downloadQt-9dcc2de14862da0bba6b74c51ac6e7a5193d4f08.zip
Qt-9dcc2de14862da0bba6b74c51ac6e7a5193d4f08.tar.gz
Qt-9dcc2de14862da0bba6b74c51ac6e7a5193d4f08.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make test work with shadow builds again.
Diffstat (limited to 'src/gui/text')
0 files changed, 0 insertions, 0 deletions