Merge branch 'develop' of

https://DennisSchiefer@bitbucket.org/DennisSchiefer/project-osrm-web.git
into develop

Conflicts:
	WebContent/routing.js
This commit is contained in:
DennisSchiefer 2012-03-14 16:50:14 +01:00
commit 0ee469c4e0

View File

@ -371,7 +371,7 @@ function snapRoute() {
updateLocation( "target" ); updateLocation( "target" );
} }
// map driving instructions to images // map driving instructions to icons
// [TODO: better implementation, language-safe] // [TODO: better implementation, language-safe]
function getDirectionIcon(name) { function getDirectionIcon(name) {
var directions = { var directions = {