summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2010-06-08 17:07:15 +1000
committerMichael Goddard <michael.goddard@nokia.com>2010-06-08 17:07:15 +1000
commit6eca5abd9e2f79110760f669154fd9c7d7d78580 (patch)
tree326fdd3ec931c5b06b030799512f530e92b0b46b /doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp
parentfeb4a74ba004df4a9a6f6cfe70c0c215226a5d12 (diff)
parent92b410393345f85aac79cfd8c92ac2b896d50fcf (diff)
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0
Conflicts: dist/changes-1.0.1
Diffstat (limited to 'doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp')
0 files changed, 0 insertions, 0 deletions