summaryrefslogtreecommitdiffstats
path: root/examples/assistant
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2010-02-02 15:20:42 (GMT)
committerck <qt-info@nokia.com>2010-02-02 15:20:42 (GMT)
commit1217df165cfe8447cfafffd52bd8ae60cb7ee8a2 (patch)
treec94061a86fe2186a41dac0aaa41c4d88413b2880 /examples/assistant
parent0a9edf7a672b4a30b817439ad67a0e08e3670e8f (diff)
parent7f31c6969ff27320b088e214b0ae6bf1ae36ecc3 (diff)
downloadQt-1217df165cfe8447cfafffd52bd8ae60cb7ee8a2.zip
Qt-1217df165cfe8447cfafffd52bd8ae60cb7ee8a2.tar.gz
Qt-1217df165cfe8447cfafffd52bd8ae60cb7ee8a2.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6
Diffstat (limited to 'examples/assistant')
0 files changed, 0 insertions, 0 deletions