Merge branch 'route_json'
authorlampehe-local <henri.lampela@ixonos.com>
Wed, 21 Jul 2010 12:22:39 +0000 (15:22 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Wed, 21 Jul 2010 12:22:39 +0000 (15:22 +0300)
commit17d73227ed23b15fb71856c32d5bd706afc16386
tree4f15af8bbf46e003270956049df25e045f1c1965
parent474aeed9a4b96534155d6d5cae8b160b6f48842f
parente92e93294a29bb73a9a85f349c83c7b6d5aed08a
Merge branch 'route_json'

Conflicts:
src/engine/engine.h
src/network/networkaccessmanager.cpp
src/network/networkaccessmanager.h
src/engine/engine.cpp
src/map/mapengine.cpp
src/network/networkaccessmanager.cpp
src/network/networkaccessmanager.h
src/routing/routingservice.cpp