Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 19 Aug 2010 11:27:53 +0000 (14:27 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 19 Aug 2010 11:27:53 +0000 (14:27 +0300)
commita866e8aa0aa84d2ca5ca88dcbab2fdbaac1d4ea9
treea4646f0c192f818207baa125a16bd9a922b8875c
parentb22c177c72658752f283512b23ab1fe5bca39617
parent0cea9ac4f9a2073903f76d6be161b236ef3e02de
Merge branch 'master' into new_panels_with_context_buttons

Conflicts:
src/ui/routingpanel.cpp
src/ui/friendlistpanel.cpp
src/ui/friendlistpanel.h
src/ui/routingpanel.cpp
src/ui/routingpanel.h