diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-01-12 14:19:38 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-01-12 14:19:38 (GMT) |
commit | fb76168df6fc73528328d2fce4f10a541af92cc2 (patch) | |
tree | 822863589790ac2df18fa13c7d425974ce580814 /src/declarative/qml | |
parent | 59b9bce59aacc2cf68a3800f4fcb486d136b91f9 (diff) | |
download | Qt-fb76168df6fc73528328d2fce4f10a541af92cc2.zip Qt-fb76168df6fc73528328d2fce4f10a541af92cc2.tar.gz Qt-fb76168df6fc73528328d2fce4f10a541af92cc2.tar.bz2 |
Doc: correcting merge error
Diffstat (limited to 'src/declarative/qml')
0 files changed, 0 insertions, 0 deletions