diff options
| author | David Laing <david.laing@nokia.com> | 2010-04-21 14:35:25 +1000 |
|---|---|---|
| committer | David Laing <david.laing@nokia.com> | 2010-04-21 14:35:25 +1000 |
| commit | 4e901a0b9bbfaf3b0a5dc35dbbfc14df53e0f681 (patch) | |
| tree | 450bc50cb8d74dbf76504b6e15ace7c84fcb7b5e /doc/src/snippets/qtlandmarksdocsample/requestexample.h | |
| parent | 8a74f3371a7204e3202dfa42a669ecf1562f9140 (diff) | |
| parent | 4d0833fdfef149762c647d3d78179c4aaecd5987 (diff) | |
Merge branch '1.1-mapsintegrate' of scm.dev.nokia.troll.no:qtmobility/qtm-location into sqlite-backend
Conflicts:
src/location/location.pro
src/location/qlandmark.cpp
src/location/qlandmarkcategory.cpp
src/location/qlandmarkmanager_p.h
Diffstat (limited to 'doc/src/snippets/qtlandmarksdocsample/requestexample.h')
0 files changed, 0 insertions, 0 deletions