Merge branch 'master' into coordinate_classes
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 20 Jul 2010 09:22:50 +0000 (12:22 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 20 Jul 2010 09:22:50 +0000 (12:22 +0300)
commitedeabac787a44c426a8ddcc6a6579883e63c0095
tree3e810a2b33bc6875fddf8a79885b39d667d74d2e
parente33ccad42d2c6b447ef19f6004161469d5787342
parent8e4c7718da7a18d456f324dbe12acdfe14dae5c6
Merge branch 'master' into coordinate_classes

Conflicts:
src/src.pro
src/ui/friendlistitem.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
tests/tests.pro
tests/ui/friendlist/friendlist.pro
tests/ui/friendlist/testfriendlist.cpp
src/src.pro
src/ui/friendlistitem.cpp
src/ui/friendlistitem.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/listitem.h
src/ui/listview.h
tests/tests.pro