diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2009-12-02 16:20:47 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2009-12-02 16:20:47 +1000 |
| commit | 700033fb1253dcb478ab691dd91523afd507b8f4 (patch) | |
| tree | b31f9d691eb536b991ff494bf454c4eef128b008 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 734c0da98266029afc147d82f15429e82c4f0140 (diff) | |
| parent | cd7f54060f0b5b2ee26ae8d13c1209a6023b2be8 (diff) | |
Merge branch 'master' of git@gitorious.org:qtcontacts-tracker/qtcontacts-tracker
Conflicts:
plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pri
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions