diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-30 07:09:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-30 07:09:47 (GMT) |
| commit | 3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8 (patch) | |
| tree | 5fd9c2ce72b1bae898ca37843069c3746e4172dd /examples/declarative/animation | |
| parent | c50f26a26f1e7ac22bd3ff08fe24a927c57e127b (diff) | |
| parent | 0e664dabc5b7325634e54d120eb374940497ca0f (diff) | |
| download | Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.zip Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.tar.gz Qt-3b79fb99c9fdf4f80fa0ca2168f421b3489aebc8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxpathview.cpp
Diffstat (limited to 'examples/declarative/animation')
0 files changed, 0 insertions, 0 deletions