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)
commitc21a2234628ee79c118cf1497e1667d0e2eba47b
treecd9628dd2adaa718af4dfbbe19121057e0e11704
parent4d7b57c0894bb722a905a485cec4b71aab10a6eb
parenteaba012c9f89624a08d1cf0e772442b6f884f904
Merge branch 'master' into gps_accuracy_ring
src/ui/indicatorbutton.cpp