diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-08 14:30:44 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-08 14:30:44 +1000 |
| commit | f1780c2b1a0e11c84455db82a271011fb6783985 (patch) | |
| tree | b72d7b8acf680711fd3554d3559c49999211c249 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 40e4b8ea7609f9a8c3f1ef520f94fc56673822f6 (diff) | |
| parent | 97f2e4206d029caa6d9087b8fb8e0def42f287cc (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
examples/examples.pro
examples/samplephonebook/contacteditor.h
examples/samplephonebook/contactlistpage.h
examples/samplephonebook/filterpage.h
examples/samplephonebook/phonebook.h
examples/samplephonebook/samplephonebook.pro
plugins/contacts/symbian/tsrc/tst_details/tst_details.pro
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions