[osrm] 02/04: Merge tag 'upstream/5.4.2+ds'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 8060e3e26472ee0284c4e6c06837fddc51ed7bb8
Merge: 10391e1 87d05de
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 3 18:52:26 2016 +0100

    Merge tag 'upstream/5.4.2+ds'
    
    Upstream version 5.4.2+ds

 CHANGELOG.md                                       |   9 +
 features/step_definitions/matching.js              | 108 +++++----
 features/support/data_classes.js                   |   1 +
 features/testbot/matching.feature                  | 113 ++++++++--
 include/engine/api/route_api.hpp                   |   8 +-
 include/engine/guidance/assemble_geometry.hpp      |  67 ++++--
 include/engine/routing_algorithms/map_matching.hpp | 245 +++++++++++----------
 include/engine/routing_algorithms/routing_base.hpp |   3 +-
 include/extractor/profile_properties.hpp           |   2 +-
 src/engine/guidance/assemble_overview.cpp          |  54 ++---
 src/engine/guidance/post_processing.cpp            |  10 +-
 src/extractor/guidance/intersection_handler.cpp    |  38 +++-
 12 files changed, 421 insertions(+), 237 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git