Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 09:02:59 +0000 (12:02 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 09:02:59 +0000 (12:02 +0300)
commit07f18e5269a6e19da10e47d25defcd62f652b55d
treedb09c56ac6ec1d2502e1026c3a20f7a3ade4f335
parentbae5eff7a23b9f28c89a06c3eff10be6421871e6
parent4af7670f591161a8f0dc3e27b33e080e16167666
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

Conflicts:
src/ui/panelbar.cpp
src/ui/paneltab.h
src/ui/tabbedpanel.cpp
src/ui/panelbar.cpp
src/ui/panelcontent.h
src/ui/paneltab.cpp
src/ui/paneltab.h
src/ui/tabbedpanel.cpp
src/ui/tabbedpanel.h