Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 27 Apr 2010 09:34:58 +0000 (12:34 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 27 Apr 2010 09:34:58 +0000 (12:34 +0300)
commit5492f49ea80064cca18efdedf81740412813a3b1
treeb8896d165f2ee54f6870bf6752b6ed0dbb795f20
parentf035382d409d3f7ed4e113fda2bcce6e8c2c2939
parent70cb3178da591429c4895da7439164c5790cc839
Merge branch 'master' into friendlist

Conflicts:
src/images.qrc
src/src.pro
res/images/arrow_left.png
res/images/arrow_right.png
src/src.pro
src/ui/infotab.cpp
src/ui/listviewscreen.cpp