Merge branch 'situare_service_v2' into situare_interact
authorJussi Laitinen <jussi.laitinen@ixonos.com>
Thu, 18 Nov 2010 12:40:08 +0000 (14:40 +0200)
committerJussi Laitinen <jussi.laitinen@ixonos.com>
Thu, 18 Nov 2010 12:40:08 +0000 (14:40 +0200)
commitfbe196abf33e07a71919e2f7f163ca630fa5350e
tree741b061adaf93c573f6f1c82c5cd42e0b65e27ed
parent532ca8dc7c8170cb304e07fc351a45692e717770
parent368e7135a62ed1ff8f3ce45d7bec8d77cb2c5d9c
Merge branch 'situare_service_v2' into situare_interact

Conflicts:
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h