projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c6347f 2e0003e)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)
1  2 
src/gui/text/qtextdocument.cpp patch | diff1 | diff2 | blob | history

diff --cc src/gui/text/qtextdocument.cpp
Simple merge
Domain: UI Framework / Uncategorized;