diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-14 12:29:13 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-14 12:29:13 (GMT) |
| commit | 1ea887517fe7245a5825c01f79b16753b3d8639f (patch) | |
| tree | a88263d5d74fa49d4da9a8d378c2d2363e82048f /tools/qdoc3/test/qt-linguist.qdocconf | |
| parent | 2a4f5a1b4e6e9632ab18c81c3e06ebf2061cd765 (diff) | |
| parent | e3ea232cdb9116914df533b423f25ffd7384a78b (diff) | |
| download | Qt-1ea887517fe7245a5825c01f79b16753b3d8639f.zip Qt-1ea887517fe7245a5825c01f79b16753b3d8639f.tar.gz Qt-1ea887517fe7245a5825c01f79b16753b3d8639f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qanimationgroup.cpp
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'tools/qdoc3/test/qt-linguist.qdocconf')
0 files changed, 0 insertions, 0 deletions