diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 09:02:29 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-15 09:10:40 (GMT) |
| commit | 6b08c50f93236fec9ed24eaf36f839315e8dc08e (patch) | |
| tree | 94a96f2ecd8c42f84b1348f67925dc51cf362f8d /src/gui/text/qtextcontrol.cpp | |
| parent | 9c04890642f9836fe25289d91a470cdd2de4e183 (diff) | |
| parent | cebaf35e3d79a7cde84a9ef5b0023e841075d5c1 (diff) | |
| download | Qt-6b08c50f93236fec9ed24eaf36f839315e8dc08e.zip Qt-6b08c50f93236fec9ed24eaf36f839315e8dc08e.tar.gz Qt-6b08c50f93236fec9ed24eaf36f839315e8dc08e.tar.bz2 | |
Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes
Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
0 files changed, 0 insertions, 0 deletions