Merge branch 'engine' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 27 Apr 2010 12:34:41 +0000 (15:34 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 27 Apr 2010 12:34:41 +0000 (15:34 +0300)
commitdc024f73c5e15c2ed59a7098282a663639e7f903
tree5dfadc0ad09f770c03d04b5bc805e9f11f56e086
parent5492f49ea80064cca18efdedf81740412813a3b1
parenta7cb49acb7f1b05097aead3f5dbb1d8826c98c85
Merge branch 'engine' into friendlist

Conflicts:
src/src.pro
src/ui/listviewscreen.h
src/ui/mainwindow.cpp
16 files changed:
images.qrc
res/images/clock.png
res/images/compass.png
res/images/dummy_Avatar.png
res/images/envelope.png
res/images/list_item_bottom.png
res/images/list_item_middle.png
res/images/list_item_top.png
res/images/static/testTile.png
src/src.pro
src/ui/friendlistitem.cpp
src/ui/friendlistitem.h
src/ui/friendlistview.cpp
src/ui/friendlistview.h
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h