diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2010-03-12 12:53:07 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2010-03-12 12:53:07 +1000 |
| commit | bcfd1d362b6ce701f87eb95f2c53b21121a7aa0d (patch) | |
| tree | dbbd735f56232b4077959a7dac847a192e1def43 /doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp | |
| parent | 699d44e14cf6ddeb8a6ce9fce5b56b18dd9d2a29 (diff) | |
| parent | d0936e2d9ee60a069286b0d0db69a2a819c38766 (diff) | |
Merge branch 'master' of gitorious.org:qtcontacts-tracker/qtcontacts-tracker
Conflicts:
qcontacttrackerbackend_p.h
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro
trackerchangelistener.h
Diffstat (limited to 'doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp')
0 files changed, 0 insertions, 0 deletions