Merge branch 'personalinfo' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 08:32:27 +0000 (11:32 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 08:32:27 +0000 (11:32 +0300)
commit443c20f86835babe9598079261e87624fd467899
treec295190d642469298f7039bf8d733043c61b683e
parentdf9ff9ed592e01b7fc3e3217e833eb6a82e18c32
parent9f7bf01fb764f22794723cb58f6204c148021d95
Merge branch 'personalinfo' into friendlist

Conflicts:
images.qrc
res/images/compass.png
src/images.qrc
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
images.qrc
src/images.qrc
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h