[osrm] 04/08: Merge tag 'upstream/4.6.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osrm.

commit 67a13819c98788deb90bafaf103698e8f51710f5
Merge: 6ad6163 1b844c7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 9 23:32:23 2015 +0200

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1

 data_structures/restriction.hpp     | 10 +++++++---
 extractor/extraction_containers.cpp | 14 ++++++++++++++
 extractor/extraction_containers.hpp |  4 ++++
 extractor/extraction_way.hpp        |  6 ++++++
 extractor/extractor.cpp             | 24 +++++++++++++++++++-----
 extractor/extractor_callbacks.cpp   | 23 ++++++++++++++++++-----
 extractor/extractor_callbacks.hpp   | 13 ++++++++++---
 extractor/restriction_parser.cpp    | 10 ++++++++--
 extractor/restriction_parser.hpp    | 20 ++++++++++++++++++--
 extractor/scripting_environment.hpp |  7 +++++++
 include/osrm/libosrm_config.hpp     |  6 +++---
 routed.cpp                          |  2 ++
 12 files changed, 116 insertions(+), 23 deletions(-)

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