diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-10-09 01:36:11 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-10-09 01:36:11 (GMT) |
| commit | 91c85c76d83260d794701100b36a0cc04f848932 (patch) | |
| tree | 86fd1204ad8358a0a41d8a61307e1d3e1ce16177 /tools/qmldebugger | |
| parent | ccb3f7c3bda46ace7b42bff5a27a11bd07602b68 (diff) | |
| parent | dda314e206162215e60dd306b6347a04f19ca5df (diff) | |
| download | Qt-91c85c76d83260d794701100b36a0cc04f848932.zip Qt-91c85c76d83260d794701100b36a0cc04f848932.tar.gz Qt-91c85c76d83260d794701100b36a0cc04f848932.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/layouts/Button.qml
Diffstat (limited to 'tools/qmldebugger')
0 files changed, 0 insertions, 0 deletions