oblonski ef2723d801 Merge branch 'master' into multiple-cap-constraints ... Conflicts: jsprit-core/src/main/java/jsprit/core/problem/job/Job.java jsprit-core/src/main/java/jsprit/core/problem/job/Service.java jsprit-core/src/main/java/jsprit/core/problem/job/Shipment.java jsprit-core/src/test/java/jsprit/core/problem/job/ServiceTest.java		2014-02-04 21:47:15 +01:00
..
java/jsprit/core	Merge branch 'master' into multiple-cap-constraints	2014-02-04 21:47:15 +01:00
resources	bugfix issue #78	2014-01-23 12:07:19 +01:00