summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextformat.h
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-01-10 14:11:52 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-01-10 14:11:52 (GMT)
commit44afade51254de33a0f31baf39034af0eb73842f (patch)
treecd9c75a8d37be58a5022a545aa939eff9e196730 /src/gui/text/qtextformat.h
parent3263f8036128cc4403cf6383324f5390eecee13b (diff)
parent2bddf15b87a9e27bfdcbc3aec5d79da49f070c15 (diff)
downloadQt-44afade51254de33a0f31baf39034af0eb73842f.zip
Qt-44afade51254de33a0f31baf39034af0eb73842f.tar.gz
Qt-44afade51254de33a0f31baf39034af0eb73842f.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/text/qtextformat.h')
0 files changed, 0 insertions, 0 deletions