Merge branch 'stacked_friends'
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 11 May 2010 07:46:44 +0000 (10:46 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 11 May 2010 07:46:44 +0000 (10:46 +0300)
commit11e362e71ee5bd25b25bdf87d0348ddffef0ac8c
treeba91c0f63d77be54488fabd4f712a268ed1226ee
parent88ab92d311e719d7a9252f56fa1b407896b240d0
parent8c8d21d31e40867f914ee6e0af23dede7e840224
Merge branch 'stacked_friends'

Conflicts:
doc/test_cases/functionality-tests.doc
src/src.pro
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h
images.qrc
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mapviewscreen.cpp
src/ui/mapviewscreen.h