Merge branch 'wallika-own' v0.2
authorKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 13:08:22 +0000 (16:08 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Mon, 19 Apr 2010 13:08:22 +0000 (16:08 +0300)
commitb200f7f1f5972070d7db678a5b238c2bb60458e9
treeaeebef31571acef10e5d6d6fe8227407d14534e4
parentc7599bbfbf762488dfbb7b55325a5d20b640336a
parentf2513e68868cd516e55c2fe6a63ca6e148fe191a
Merge branch 'wallika-own'

Conflicts:
src/ui/mapviewscreen.cpp
src/src.pro