diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-06-30 18:26:52 +1000 |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-06-30 18:26:52 +1000 |
| commit | 912dc4246b76a632ea03238029a4342e29e042c7 (patch) | |
| tree | 845f6e6c55af99f19207f1225a86eef7c1782d4b /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 09c7da7f4c1ca4f6b4290e43c516a88f09b4d6cb (diff) | |
| parent | 37b18950b2665943cb6b7bdfb1f43b035559403e (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework
Conflicts:
doc/src/qtmobility.qdocconf
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions