1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
graphhopper-jsprit/jsprit-core
oblonski b5998e1d93
Merge branch 'master' into max-time-feature
# Conflicts:
#	jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
#	jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
#	jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/PickupTest.java
#	jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java
#	jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
2017-07-05 10:40:18 +02:00
..
src Merge branch 'master' into max-time-feature 2017-07-05 10:40:18 +02:00
.gitignore clean directories 2014-06-29 22:53:50 +02:00
LICENSE.md switch to Apache License v2 - related to #216 2016-07-28 07:43:43 +02:00
pom.xml 1.7.3-SNAPSHOT 2017-06-08 12:33:33 +02:00