Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 13:28:14 +0000 (16:28 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Wed, 11 Aug 2010 13:28:14 +0000 (16:28 +0300)
1  2 
src/ui/indicatorbuttonpanel.cpp

Simple merge