Merge branch 'new_panels' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 17 Aug 2010 08:48:20 +0000 (11:48 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 17 Aug 2010 08:48:20 +0000 (11:48 +0300)
commit14915a53924c650f0a99e0ba4b2964686c2aaa1d
treeb5f61d670742ac8a0605a408fee0050f9427ade8
parent0ef4e3011ee50d2a44ca211c9423877685d21047
parentc1d4d41bdc57b8eee0dd3bbcd9a997e2d4719a99
Merge branch 'new_panels' into locationlistview

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