Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
authorSami Rämö <sami.ramo@ixonos.com>
Fri, 13 Aug 2010 13:36:23 +0000 (16:36 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Fri, 13 Aug 2010 13:36:23 +0000 (16:36 +0300)
commit69aad6909e7ce7482e56255b65b70cfdffaaa9a1
tree513bcd9d33681e80aa26d5cc4dcea7460143094d
parentd98c553c5ce1e9737145f3c2ffe9d322b9a39804
parente1bfb9196dc9be23c456652a4928634a277600ec
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
src/ui/friendlistpanel.cpp
src/ui/mainwindow.h
src/ui/tabbedpanel.h
src/ui/userinfo.cpp