diff options
| author | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-07-01 13:03:15 +1000 |
|---|---|---|
| committer | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-07-01 13:03:15 +1000 |
| commit | a3304473e25c31cf0bc91284e503329f6e7c9edc (patch) | |
| tree | 68a5e0d575e19cd674ff61a59bc5823fdaea436e /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 8a1c00e4ec6e3a527c651e8151f809dd7d47fc71 (diff) | |
| parent | 7180fcbaddc353ba638c483fc4eb7b060b196714 (diff) | |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qtmobility/qtm-serviceframework
Conflicts:
doc/src/messaging-installation-on-windows-mobile.qdoc
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions