diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-11 16:37:20 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-11 16:37:20 +1000 |
| commit | 280a894dc66bb9cdf1d30e28eeb74cc246dd2c96 (patch) | |
| tree | 3c9aa464abe9c902ff5e31437b0cbd6494ab37c3 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 7549041226945145594e2d5d78e74b98d666764a (diff) | |
| parent | 29691cbfa4c753cc0da0448133ab2c9bcbf596cf (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtm-contacts into unstable
Conflicts:
src/contacts/qcontactmanager_p.cpp
tests/auto/qcontactmanager/tst_qcontactmanager.cpp
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions