Merge branch 'gps'
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 11 May 2010 12:41:34 +0000 (15:41 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 11 May 2010 12:41:34 +0000 (15:41 +0300)
commit47a53b9585ade6fd38cd0636e1f7d58fb0224d42
treec7c4c351034445982318856f522ec2d412658d85
parente491a1e60ea2f23977437bd086d007f335e37bd8
parent594cdd140d977c86fb37bcb1c71081607b197aa8
Merge branch 'gps'

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