Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 13:00:58 +0000 (16:00 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 13:00:58 +0000 (16:00 +0300)
commitc294a1907a00aea6989d21a9249b84d41b94cb50
tree3140036f5ad5eb0cd134943a4111b901f9068942
parent15f22b26b7a9f261d869fbd397fa24e64d59f2e5
parent0019fe0811a0585c9558ca543b2143857acb421b
Merge branch 'image_fetcher' of https://vcs.maemo.org/git/situare into friendlist

Conflicts:
src/situareservice/situareservice.cpp
images.qrc
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/friendlistitem.cpp
src/ui/friendlistitem.h
src/ui/friendlistview.cpp
src/ui/friendlistview.h
src/ui/listviewscreen.cpp