Merge branch 'master' into indicator
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 28 Jul 2010 14:04:11 +0000 (17:04 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 28 Jul 2010 14:04:11 +0000 (17:04 +0300)
commit15a1c52ca0f7161788423ec804940e71d469d23f
treebaab2821a837e981602bb056ec2d9a1763ee7727
parentfd525afac2549721475244f643fa6680c76d1a50
parentb9c5c36f7c1ee087d79d588d221702dd20fde32c
Merge branch 'master' into indicator

Conflicts:
src/ui/indicatorbutton.h
src/ui/indicatorbutton.cpp
src/ui/indicatorbutton.h