Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 12 Aug 2010 08:03:20 +0000 (11:03 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Thu, 12 Aug 2010 08:03:20 +0000 (11:03 +0300)
commit59971e123b75430af242b79aff1e2d711625f499
tree8368fa4a4078f2724359fdae615bbdb1e66c2d83
parenta608961e6c150a041297658abbc44eb79c3c6480
parent9538bd47b651af291ef9f92c3c9a0688f32daad1
Merge branch 'master' into new_panels
src/ui/indicatorbutton.h
src/ui/mainwindow.cpp