Merge branch 'master' into gps_accuracy_ring
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 2 Aug 2010 08:24:22 +0000 (11:24 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 2 Aug 2010 08:24:22 +0000 (11:24 +0300)
1  2 
src/ui/indicatorbutton.cpp

Simple merge