Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 09:14:14 +0000 (12:14 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 09:14:14 +0000 (12:14 +0300)
commit5cc7fe0395da55a368702c337c8920dae345a841
treea72e12e38547002d211f75097de9ddddcd91a5cb
parent9dad208a59a9f97fa225569dab1d44da3cca82ed
parent75b29b02c98ef56d388e845648b20049be3e144b
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
src/ui/mapviewscreen.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h