diff options
| author | Jari Savinainen <qt-info@nokia.com> | 2010-03-22 13:24:11 +0200 |
|---|---|---|
| committer | Jari Savinainen <qt-info@nokia.com> | 2010-03-22 13:24:11 +0200 |
| commit | f0c345b979f531d5523d07d3bfc8d5be66f56434 (patch) | |
| tree | 44d6739969c39def6b0e08395d1a6f86aaebde9a /doc/src/snippets/sysinfo-snippets/main.cpp | |
| parent | 5b378cfca41dcb55073fecc181d4e5e8a7065d1e (diff) | |
| parent | 450b7a9e8ca15d4fd09e174ff650f502f29fa5ec (diff) | |
Merge commit 'origin/maemo5-dev' into maemo5-d
Conflicts:
src/location/qgeopositioninfosource_maemo5.cpp
src/location/qgeopositioninfosource_maemo5_p.h
Diffstat (limited to 'doc/src/snippets/sysinfo-snippets/main.cpp')
0 files changed, 0 insertions, 0 deletions