Merge branch 'trial/notifications' into develop

Conflicts:
	WebContent/main.html
This commit is contained in:
DennisSchiefer
2012-07-05 14:02:37 +01:00
13 changed files with 226 additions and 17 deletions
+1
View File
@@ -99,6 +99,7 @@ onDrag: function(e) {
OSRM.Geocoder.updateLocation( this.parent.label );
},
onDragStart: function(e) {
OSRM.GUI.deactivateTooltip( "dragging" );
OSRM.G.dragging = true;
this.switchIcon(this.options.dragicon);