Merge branch 'master' of https://vcs.maemo.org/git/situare into map
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 3 May 2010 06:42:49 +0000 (09:42 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 3 May 2010 06:42:49 +0000 (09:42 +0300)
commit52240c9cdc00f6d29a22f0305f112533006412ee
tree6f4dd83e7141f2ccdecf6cb08b2b48faaed57c48
parent3a85d7f4448a4370c8ca8ab3f5cd5c5cebe9d6f5
parentac2a4a19c101544f6ea49560787f9c876996acd4
Merge branch 'master' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/updatelocation/texteditautoresizer.h
src/ui/mainwindow.h