DennisSchiefer 517f321ccc Merge branch 'trial/notifications' into develop ... Conflicts: WebContent/main.html		2012-07-05 14:02:37 +01:00
..
base	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
gui	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
images	separated normal notifications from important notifications (that lock	2012-07-04 15:35:06 +01:00
leaflet	completed language-dependent bing maps	2012-05-15 21:03:58 +02:00
localization	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
printing	Merge branch 'trial/alternatives' into develop	2012-07-05 09:33:00 +01:00
routing	changed check to make sure parameters exist	2012-07-05 09:45:54 +01:00
utils	Merge branch 'trial/alternatives' into develop	2012-07-05 09:33:00 +01:00
favicon.ico	moved favicon handling to webserver	2012-04-18 06:56:17 +01:00
main.css	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
main.html	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
main.js	Merge branch 'trial/notifications' into develop	2012-07-05 14:02:37 +01:00
OSRM.base.js	bumped version to 0.1.6	2012-05-16 12:37:59 +01:00
OSRM.config.js	added stuff to alternatives	2012-07-03 14:39:29 +01:00