diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:22:39 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:22:39 (GMT) |
| commit | 4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3 (patch) | |
| tree | 3ce3662e9eb0b1c9a1f5d1e960954ce507fe144a /examples/help/simpletextviewer/findfiledialog.cpp | |
| parent | e25e77c3d8bfd0f33aeea2484d714ade6a65a664 (diff) | |
| parent | 03e80ad9057ecc12a3e61e8a968e390023e5561d (diff) | |
| download | Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.zip Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.tar.gz Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/loader/qmlfolderlistmodel.h
Diffstat (limited to 'examples/help/simpletextviewer/findfiledialog.cpp')
0 files changed, 0 insertions, 0 deletions