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 12:28:20 +0000 (15:28 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 16 Aug 2010 12:37:52 +0000 (15:37 +0300)
commit83c81ab2f85742f0c581113c8a98062eb2ecef2d
treeebdd03538f09e9f0fc985909c9fb917186dbb184
parent8cd386f91d1030ce4a7f3580b349d711166adc7d
parent8b92122d6cfdd2422e1d6153b0e026f5a64a04fe
Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels

 - Reviewed by Sami Rämö

 - Made also some small fixes

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