Merge branch 'dev' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 08:48:58 +0000 (11:48 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Apr 2010 08:48:58 +0000 (11:48 +0300)
commitdb4edc6acb052d2fee4b7ac40658b309d30a270e
tree35b549d5d801a77932c0147d67911aad1f916cd8
parent443c20f86835babe9598079261e87624fd467899
parent886eea0476a6176ad754c944bb1981023b2a4564
Merge branch 'dev' into friendlist

Conflicts:
images.qrc
src/src.pro
src/ui/listviewscreen.cpp
src/ui/listviewscreen.h
src/ui/situareuser.cpp
src/user/user.cpp
images.qrc
src/src.pro
src/ui/buttonitem.cpp
src/ui/infotab.cpp
src/ui/listviewscreen.cpp
src/ui/situareuser.cpp