Merge branch 'nikosmaster' old-master
authorNiko Böckerman <niko.bockerman@gmail.com>
Sun, 30 Jan 2011 00:02:36 +0000 (02:02 +0200)
committerNiko Böckerman <niko.bockerman@gmail.com>
Sun, 30 Jan 2011 00:02:36 +0000 (02:02 +0200)
commit3ac7e8dad2ed3ec233b66d68e1d40e5c99cf82ae
treec2bf9d4d24fd3c122835f926f2169de04a1efe51
parentadf07378beebd2203e498a0888e0fc06186f7646
parent783998726749a0c77d9322db29acc59a623077c8
Merge branch 'nikosmaster'
zouba/src/gpscontroller.cpp
zouba/src/gpscontroller.h
zouba/src/route.cpp
zouba/src/route.h
zouba/src/route_p.cpp
zouba/src/route_p.h
zouba/src/routedata.h
zouba/src/ui.cpp
zouba/src/ui.h
zouba/src/uicontroller.cpp
zouba/src/uicontroller.h