diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-11 13:31:51 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-11 13:31:51 +1000 |
| commit | de0853aa86676b612b97d0dadff61f0d8f476274 (patch) | |
| tree | 043ae34eb944aca264e24b360b398522efac34b7 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | d41c4335b882617b2674b90ecfde1eee731c2cc1 (diff) | |
| parent | 9033925afe37a11427912a5d587645a2fad0c144 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtm-contacts into unstable
Conflicts:
src/contacts/details/qcontactdetails.cpp
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions