Merge branch 'map' of https://vcs.maemo.org/git/situare into map
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 14 Apr 2010 09:15:10 +0000 (12:15 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 14 Apr 2010 09:15:10 +0000 (12:15 +0300)
commit3893a0e07f45dda91f2482d072590cc41da86d9c
treeb1543d4e11eed543c1708f71a08ba0dcc0290b07
parent52072c720374770e7a0cc52bd44a9ea1b95f4cb2
parent8ae5957c543857947582406bf962051b07a1965d
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
tests/testmap/testmapengine/testmapengine.cpp
src/map/mapengine.h
src/map/mapfetcher.cpp
tests/testmap/testmapengine/testmapengine.cpp