Preliminary merge. Integration is brancehd from fresh master.
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 09:34:22 +0000 (12:34 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 3 May 2010 09:34:22 +0000 (12:34 +0300)
commitcd4bf544ea1157422de279eb568e945311ce56c1
tree8a21502a9a3effa4cf4307cee8ff10b739a72eb3
parent57d30289d415ec19e1058ba78bf3fbbd58d6fa18
parentd0a64fd30993e2d634180a35983877a01453855c
Preliminary merge. Integration is brancehd from fresh 

Merge branch 'own_location' into integration

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