summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@nokia.com>2010-03-01 12:54:34 (GMT)
committerMaurice Kalinowski <maurice.kalinowski@nokia.com>2010-03-01 12:54:34 (GMT)
commit5841e1d4662c97433a09ac0e3c6430145ee7ddee (patch)
treea76239336c477ebfce224f35038ad603a9579051 /tools/qml
parent4795583b42577259499b34da07077f501e45ce42 (diff)
parentdd4079c6c465c80104ff0ea1cda681ed7cc18310 (diff)
downloadQt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.zip
Qt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.tar.gz
Qt-5841e1d4662c97433a09ac0e3c6430145ee7ddee.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo1_47
Diffstat (limited to 'tools/qml')
0 files changed, 0 insertions, 0 deletions