Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 11:49:16 +0000 (14:49 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 11:49:16 +0000 (14:49 +0300)
commite6008e53f49cd12f512f9e8a301b268cc6ef19d4
tree6fb0f536000de5d66b1dc76754059c4cf512f377
parent804f5f55ea87dd57d5bf60725a42e84345fac07e
parent0f5ed3633156c255d621de30e2da4e5c0c3dfd86
Merge branch 'master' into new_panels

Conflicts:
src/src.pro
src/ui/indicatorbutton.cpp
src/ui/mainwindow.cpp
src/ui/panelcommon.h
src/src.pro
src/ui/indicatorbutton.cpp
src/ui/indicatorbutton.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/ui/panelcommon.h