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)
commit8fd7ff6d9986b92cb7c6472352cbababa7d373e1
tree8bc0344186cf5133fef68c44c57853a18f230fc2
parent5a58d39f9637d1fdce92aa481ff037bf4a7fff76
parent1798a46a4ce666b9f318b82cfab6b8b37d0aed68
Merge branch 'master' into new_panels
src/ui/indicatorbuttonpanel.cpp