diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2010-03-31 17:10:42 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2010-03-31 17:10:42 +1000 |
| commit | c2d828597056a9c814f2983fb12a4861ecccb232 (patch) | |
| tree | 309a02f4ef9f2c76acbbbfacad507f92141dba73 /doc/src/snippets/service-snippets/filemanagerstorage.cpp | |
| parent | c53ed147070a2c0762ef2356df3c7ef8c493c59a (diff) | |
| parent | ff2b657de60ccdcb08daf5e04893ca5eff78fbca (diff) | |
Merge branch 'contacts1.0' into main1.0
Conflicts:
examples/qmlcontacts/qmlcontact.cpp
src/s60installs/s60installs.pro
Diffstat (limited to 'doc/src/snippets/service-snippets/filemanagerstorage.cpp')
0 files changed, 0 insertions, 0 deletions