diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-03 16:23:28 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-03 16:23:28 +1000 |
| commit | 344b41be3469beaf88c6f7c7de24c34ebb895610 (patch) | |
| tree | cc0df79a18918081010fa54f54d5fb40123053e0 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | ce73651949f8fcaf5d7ed28a084a7941991262b6 (diff) | |
| parent | 946a407deadf331f1fe1b9117a25a59029d7205e (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtcontacts
Conflicts:
examples/samplephonebook/contacteditor.h
examples/samplephonebook/contactlistpage.h
examples/samplephonebook/filterpage.h
examples/samplephonebook/finddialog.cpp
examples/samplephonebook/groupeditdialog.cpp
examples/samplephonebook/phonebook.cpp
examples/samplephonebook/samplephonebook.pro
examples/samplephonebook/serialiser.h
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions