Merge commit 'origin/locationlistview' into friendlist_filtering_text_field
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 13:24:15 +0000 (16:24 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 13:24:15 +0000 (16:24 +0300)
commitb9e210ea869151849eb681ee170fca17ae5e305d
treeb348bf5482f5cb8a73520bf871d310a1e9cd3139
parent31bac173fea920e4bd2133ec8ed33d244137e9b1
parente21f5bc78100296f6de77155f3962e6d37bd3bf4
Merge commit 'origin/locationlistview' into friendlist_filtering_text_field

Conflicts:
src/application.cpp
src/main.cpp
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/engine/engine.cpp
src/engine/engine.h
src/main.cpp
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h