summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-09 11:06:23 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-09 11:06:23 (GMT)
commit49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a (patch)
tree5af36bfada132b514dd20e7860c15d612c306738 /tools/qml
parent8c904712aa658dd0dd405b64913b8e6ade17f3df (diff)
parent382cbd618fe4f5093bb1ca3f4fca3bb35614a18d (diff)
downloadQt-49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a.zip
Qt-49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a.tar.gz
Qt-49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qml')
0 files changed, 0 insertions, 0 deletions