summaryrefslogtreecommitdiffstats
path: root/tools/assistant/assistant.pro
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-09 05:59:31 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-09 05:59:31 (GMT)
commit75581e3330916f756462ff6924abf2c62c0d228e (patch)
tree5df732f65ba220fafac5b772229e3101d783f46d /tools/assistant/assistant.pro
parent4a40a67827c8f259876e906a5a9afd2159ca9028 (diff)
parent79832f2156745ee2c6608ce7425fb2350b56f18d (diff)
downloadQt-75581e3330916f756462ff6924abf2c62c0d228e.zip
Qt-75581e3330916f756462ff6924abf2c62c0d228e.tar.gz
Qt-75581e3330916f756462ff6924abf2c62c0d228e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/assistant/assistant.pro')
0 files changed, 0 insertions, 0 deletions