diff options
| author | Alex <qt-info@nokia.com> | 2010-06-28 19:13:07 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-28 19:13:07 +1000 |
| commit | 2c876e6886d533d2933092be22a7985c44631e44 (patch) | |
| tree | 0f488fb79cf6e4b693b06e3e38eea2f8ca2d0d09 /doc/src/snippets/service-snippets/filemanagerstorage.cpp | |
| parent | c005285cb0878d54df9e23ff9d2cab4cff660caf (diff) | |
| parent | 1b17c1ea5de3d3a2965dcb586033b73913969e88 (diff) | |
Merge branch '1.0'
Conflicts:
plugins/declarative/contacts/contacts.pro
src/systeminfo/qsysteminfo_linux_common.cpp
Diffstat (limited to 'doc/src/snippets/service-snippets/filemanagerstorage.cpp')
0 files changed, 0 insertions, 0 deletions