Merge branch 'master' into situare_interact
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 17 Nov 2010 08:41:47 +0000 (10:41 +0200)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 17 Nov 2010 08:41:47 +0000 (10:41 +0200)
commit5b75ad801a71bb74fc9e4dbe6377afb333ce12bf
tree017249ea88b9b9347cd7eec7e2796c5f131ec0fe
parent0abe2f3534d092df9390ca83f3a38b4fdfceeadb
parent3e2322e7e0fae1fc67018015b193b1f494ee7315
Merge branch 'master' into situare_interact

Conflicts:
images.qrc
res/images/contact_btn.png
res/images/contact_btn_s.png
src/engine/engine.cpp
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/userinfo.cpp
src/ui/userinfo.h
src/ui/userinfopanel.h
16 files changed:
images.qrc
src/engine/engine.cpp
src/engine/engine.h
src/facebookservice/facebookauthentication.cpp
src/map/mapengine.cpp
src/situareservice/situareservice.cpp
src/situareservice/situareservice.h
src/src.pro
src/ui/friendlistpanel.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/panelbase.cpp
src/ui/userinfo.cpp
src/ui/userinfo.h
src/ui/userinfopanel.cpp
src/ui/userinfopanel.h