Merge branch 'trial/alternatives' into develop

Conflicts:
	WebContent/routing/OSRM.Routing.js
This commit is contained in:
DennisSchiefer
2012-07-05 09:33:00 +01:00
13 changed files with 209 additions and 28 deletions
+1
View File
@@ -65,6 +65,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
<script src="gui/OSRM.Selector.js" type="text/javascript"></script>
<script src="gui/OSRM.MainGUI.js" type="text/javascript"></script>
<script src="routing/OSRM.Routing.js" type="text/javascript"></script>
<script src="routing/OSRM.RoutingAlternatives.js" type="text/javascript"></script>
<script src="routing/OSRM.RoutingDescription.js" type="text/javascript"></script>
<script src="routing/OSRM.RoutingGeometry.js" type="text/javascript"></script>
<script src="gui/OSRM.RoutingGUI.js" type="text/javascript"></script>