diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-10 10:29:17 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-10 10:29:17 +1000 |
| commit | c34d4e418cb4a4d835a47cdeb7e26151695ec55b (patch) | |
| tree | 3fd8a5766a8a52bbfa6774c12381b79250976915 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 0e3ef9f140e21d3ddb05f21aaf705296b68ef692 (diff) | |
| parent | c22762f7e3f8df861110d859af9964b5a7706b40 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtcontacts
Conflicts:
plugins/contacts/contacts.pro
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions