Merge commit 'origin/locationlistview' into friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 08:39:20 +0000 (11:39 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 12 Aug 2010 08:39:54 +0000 (11:39 +0300)
commit9ccff5a8da320cff9a24f19137ccbbf7be1d7e47
tree0834c890c472828d1d2fa2dc7049e18f2e221bf2
parented97b295a931e49afd4ecc2ed2d34302fb8cbfc5
parent03a2f5801d3f1517954c5e3dd6bdece7793abf87
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field

Conflicts:
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
tests/tests.pro