diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2010-04-06 22:29:30 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2010-04-06 22:29:30 +1000 |
| commit | c612c2822c41d37532d471919233f0bc7851406d (patch) | |
| tree | 9b8e7b8fe041582b09e6e3917a95b2c9eb6ceffc /doc/src/snippets/service-snippets/filemanagerstorage.cpp | |
| parent | 23e8130d45b1e8698a2d1cb45406ec6c4ac805a0 (diff) | |
| parent | 5eab2b12e8a68f533e6d14ba928b297082be2171 (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into main1.0
Conflicts:
src/s60installs/s60installs.pro
Diffstat (limited to 'doc/src/snippets/service-snippets/filemanagerstorage.cpp')
0 files changed, 0 insertions, 0 deletions