Merge branch 'master' into new_panels
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 16 Aug 2010 12:08:15 +0000 (15:08 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Mon, 16 Aug 2010 12:08:15 +0000 (15:08 +0300)
1  2 
src/ui/indicatorbuttonpanel.cpp

Simple merge