diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:40:08 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2010-05-18 16:40:08 +1000 |
| commit | 599fc2384ed6b45a798e6540dae0281cbb351bc6 (patch) | |
| tree | fd61ec9904e6a9a939e93ffaeb68fa8cbf703102 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | d20b5f83c2d6590fc5bdb424143f77769f23eaa6 (diff) | |
| parent | 1a046c110a194daa8d103b09e171bd1b322b6cec (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts
Conflicts:
examples/qmlcontacts/qmlcontact.cpp
examples/qmlcontacts/qmlcontact.h
plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp
plugins/contacts/symbian/src/transform/cnttransformavatar.cpp
plugins/contacts/symbian/src/transform/cnttransformcontact.cpp
plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions