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)
commit8b92122d6cfdd2422e1d6153b0e026f5a64a04fe
treea3804cd2d3d86f7441512f36eb39d679e7fa2e4c
parent0e8cc880b2898b24bcee719a916ef2871a3b0f06
parent8bd159316924c4191a68596038c8ebca97a1d45a
Merge branch 'master' into new_panels
src/ui/indicatorbuttonpanel.cpp