summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp
diff options
context:
space:
mode:
authorDavid Laing <david.laing@nokia.com>2010-07-05 10:57:01 +1000
committerDavid Laing <david.laing@nokia.com>2010-07-05 10:57:01 +1000
commit36b156fd1021ab86503a14852e6624602edc038b (patch)
tree033b26047252fd68cda5d99b9e50c70564b907a1 /doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp
parent031753bd286d1a7d833afeccefe8947f2a880a7f (diff)
parent9fe19574277b433dc6c4a99bfeb4c1ea4f6e1c82 (diff)
Merge branch 'master' of ../../mainline/qtmobility
Conflicts: examples/telephony/dialer/dialer.pro
Diffstat (limited to 'doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp')
0 files changed, 0 insertions, 0 deletions