diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-24 17:20:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-24 17:20:58 (GMT) |
| commit | e463546d11464699061574d671d5cd5f3c14f05f (patch) | |
| tree | 8be5e318067dd7954f4af0c680538d96aca07989 /doc/src/template | |
| parent | 4adf280fb6bda8e519bf23606b841e040cb04fab (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | Qt-e463546d11464699061574d671d5cd5f3c14f05f.zip Qt-e463546d11464699061574d671d5cd5f3c14f05f.tar.gz Qt-e463546d11464699061574d671d5cd5f3c14f05f.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'doc/src/template')
0 files changed, 0 insertions, 0 deletions