oblonski d2151f3e1f Merge remote-tracking branch 'choose_remote_name/relaxAPI' into ... PickupAndDelivery Conflicts: jsprit-core/src/main/java/algorithms/BestInsertionBuilder.java jsprit-core/src/main/java/algorithms/ServiceInsertionCalculator.java jsprit-core/src/main/java/algorithms/UpdateLoadAtActivityLevel.java jsprit-core/src/main/java/algorithms/UpdateLoadsAtStartAndEndOfRouteWhenJobHasBeenInserted.java jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java		2013-11-11 20:54:45 +01:00
..
.settings	ini	2013-06-04 10:25:47 +02:00
src	Merge remote-tracking branch 'choose_remote_name/relaxAPI' into	2013-11-11 20:54:45 +01:00
.classpath	ini	2013-06-04 10:25:47 +02:00
.gitignore	rm .DS_Store files and add them to .gitignore	2013-06-06 11:00:07 +02:00
.project	ini	2013-06-04 10:25:47 +02:00
license.txt	change license from GPLv2 to LGPLv3	2013-10-14 16:41:10 +02:00
pom.xml	[maven-release-plugin] rollback the release of vq	2013-10-17 16:35:20 +02:00