summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextoption.cpp
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-11-10 10:35:10 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-11-10 10:35:10 (GMT)
commit294ca3b59dc02e1c89e2cac8007a74c61a2828fe (patch)
tree77aaa7a83107953f9e5591d09917ecb0b5400268 /src/gui/text/qtextoption.cpp
parentf42dd78db71c29d288b4a76a2fcfe720335afe1a (diff)
parent451e7fcad72366cf40bcb00931b86aafba1b983f (diff)
downloadQt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.zip
Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.gz
Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/text/qtextoption.cpp')
0 files changed, 0 insertions, 0 deletions