Merge branch 'friendlist' into integration
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 12:20:40 +0000 (15:20 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 3 May 2010 12:20:40 +0000 (15:20 +0300)
commitdfcea95054582e3ef83b366e0b0f5671b8b43282
tree83a252bea28e5f99477e9378a8d95a7d44dc6f9f
parent279f932062f78ffc2dff812b441807952e37b869
parent69b7780b72f520d2fca9b75cfaa5dc11b76c93d4
Merge branch 'friendlist' into integration

Conflicts:
src/engine/engine.cpp
src/engine/engine.h
src/map/mapview.h
src/situareservice/situareservice.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
13 files changed:
src/engine/engine.cpp
src/engine/engine.h
src/map/mapcommon.h
src/map/mapengine.cpp
src/map/mapengine.h
src/situareservice/situareservice.h
src/src.pro
src/ui/friendlistitem.cpp
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/updatelocation/texteditautoresizer.h