Merge branch 'friendlist' of https://vcs.maemo.org/git/situare into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Apr 2010 08:09:53 +0000 (11:09 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Apr 2010 08:09:53 +0000 (11:09 +0300)
commit5ae403ad4e1df26ee4e37e8b9932d9e75651d2d5
tree66902f36b6ecff7a3e9ab86c05373fd16dee44fb
parentffd4889f40bdf37c5864b2f87c6c36cc1a7eae00
parent25362c02584ce613d4b121fb80411a0ffbe49495
Merge branch 'friendlist' of https://vcs.maemo.org/git/situare into friendlist

Conflicts:
src/ui/listviewscreen.h
src/engine/engine.cpp
src/engine/engine.h
src/ui/listviewscreen.h
src/ui/mainwindow.h