diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:12:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-28 05:12:21 (GMT) |
| commit | daab991ef3705813cf0f3662c0b0bc241cafdf0f (patch) | |
| tree | 91fecefe392557fbac53574fbfb6dac8906a108b /examples/declarative/connections | |
| parent | 2b8abf28d10a6d064fe116892161289be5ffb391 (diff) | |
| parent | c139630bb792e3d0e364c05c7be3e190bfd90b64 (diff) | |
| download | Qt-daab991ef3705813cf0f3662c0b0bc241cafdf0f.zip Qt-daab991ef3705813cf0f3662c0b0bc241cafdf0f.tar.gz Qt-daab991ef3705813cf0f3662c0b0bc241cafdf0f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of ../kinetic into kinetic-declarativeui-qfx
Conflicts:
examples/declarative/minehunt/minehunt.qml
Diffstat (limited to 'examples/declarative/connections')
0 files changed, 0 insertions, 0 deletions