diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 05:45:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 05:45:10 (GMT) |
| commit | 5d5630f19afdecf0d68092d852d0e49d78ffd7b4 (patch) | |
| tree | dda9d9ece605856d62fa39cbc3ec85344c8d4534 /src/declarative/qml/qmlobjectscriptclass.cpp | |
| parent | 91be655a7e893d34fdbdb71aa5a329b641c80992 (diff) | |
| parent | cc29b52707a556a83a90d207d3c7796a6ce27616 (diff) | |
| download | Qt-5d5630f19afdecf0d68092d852d0e49d78ffd7b4.zip Qt-5d5630f19afdecf0d68092d852d0e49d78ffd7b4.tar.gz Qt-5d5630f19afdecf0d68092d852d0e49d78ffd7b4.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qbitfield_p.h
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass.cpp')
0 files changed, 0 insertions, 0 deletions