diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-17 06:57:24 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-17 06:57:24 (GMT) |
| commit | 065d6dcc16d5b48b875ebe9bd755b1c605f86d89 (patch) | |
| tree | 24afc499f4183bf3246cf305933a14d651b910ea /src/declarative/extra/qmlfolderlistmodel.h | |
| parent | fe66eaeed64402a7b22a43a85cd92c938a534b71 (diff) | |
| parent | 43a497cac00a93f015ec62339529f36ba3f19ece (diff) | |
| download | Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.zip Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.tar.gz Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.h
Diffstat (limited to 'src/declarative/extra/qmlfolderlistmodel.h')
0 files changed, 0 insertions, 0 deletions