diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-10 05:52:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-10 05:52:25 (GMT) |
| commit | bf750d1df7e1474ffddc547205f7f20520559ea7 (patch) | |
| tree | cebde1834efd136e82e124b27e21cab42aabb01f /src/gui/itemviews/qlistwidget.cpp | |
| parent | 4f40fa9b92f6f31f5a6d584f8890e2331b68f3bc (diff) | |
| parent | 4dc4cfac667389efda4a43df5ff8cfa4ba305a2f (diff) | |
| download | Qt-bf750d1df7e1474ffddc547205f7f20520559ea7.zip Qt-bf750d1df7e1474ffddc547205f7f20520559ea7.tar.gz Qt-bf750d1df7e1474ffddc547205f7f20520559ea7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlvme.cpp
Diffstat (limited to 'src/gui/itemviews/qlistwidget.cpp')
0 files changed, 0 insertions, 0 deletions