Merge branch 'master' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 10 Aug 2010 07:06:38 +0000 (10:06 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 10 Aug 2010 07:06:38 +0000 (10:06 +0300)
commit3db2535de99327a951e545d409652182da2b158d
treeef351d8bb5d838f2f9a251b341fa5bb262a7df92
parent4c7989bc7a1734b202fe6e68d43079d4f839de5d
parent3e621dc4341351db74ac1029285f4b0af94cd30a
Merge branch 'master' into locationlistview

Conflicts:
src/engine/engine.cpp
src/routing/routingservice.cpp
src/src.pro
src/engine/engine.cpp
src/engine/engine.h
src/map/mapengine.cpp
src/src.pro
src/ui/locationlistitem.cpp
src/ui/mainwindow.cpp