Merge branch 'master' into situare_interact
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 7 Sep 2010 07:21:50 +0000 (10:21 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 7 Sep 2010 07:21:50 +0000 (10:21 +0300)
commitcf2968f0f6396b271c4a1c4f580b1701b3d804e4
treecc9f7ac413743ac2bbc7980ee8f2ac9a79c48171
parent29a9ab11cb6b97c4a2bba86dcee9925da946eef2
parent489cdf170d8d5e43b8b20127229a72bb8faaf0a2
Merge branch 'master' into situare_interact

Conflicts:
images.qrc
res/images/contact_btn_d.png
18 files changed:
images.qrc
src/engine/engine.cpp
src/situareservice/database.cpp
src/situareservice/database.h
src/situareservice/notification.cpp
src/situareservice/notification.h
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/meetpeoplepanel.cpp
src/ui/meetpeoplepanel.h
src/ui/notificationlistitem.cpp
src/ui/notificationlistitem.h
src/ui/notificationpanel.cpp
src/ui/notificationpanel.h