summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/script/qmlbasicscript.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-27 07:01:31 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-27 07:01:31 (GMT)
commitcc31d8c9de2dd6d8f0f60a00d8b0dc2576a8a829 (patch)
tree6350d6715738a5a5b21c9379294ae05d37bad895 /src/declarative/qml/script/qmlbasicscript.cpp
parented5d5f6f04cda1f7aa3ea66be5fefc0a85429794 (diff)
parentd53e4499f864719446abdb7fdeff433dbb3f7d98 (diff)
downloadQt-cc31d8c9de2dd6d8f0f60a00d8b0dc2576a8a829.zip
Qt-cc31d8c9de2dd6d8f0f60a00d8b0dc2576a8a829.tar.gz
Qt-cc31d8c9de2dd6d8f0f60a00d8b0dc2576a8a829.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/script/qmlbasicscript.cpp')
0 files changed, 0 insertions, 0 deletions