summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-06-09 06:32:07 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-06-09 06:32:07 (GMT)
commitf2eab026602a0608e036018eeacf3fa6c8ca3fa7 (patch)
tree97be8a8e269ea49fb68d4908d8f7d0f47afbd1d6 /templates
parent22d7c82b71f34df637efd0ed39b3d63719a2bf67 (diff)
parent17fcc84e5ebcf09f80a4bbebafde913d0422a91e (diff)
downloadQt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.zip
Qt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.tar.gz
Qt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions