oblonski 2993202d49 Merge branch 'master' into multiple-cap-constraints ... Conflicts: jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleType.java jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleImplTest.java jsprit-core/src/test/java/jsprit/core/problem/vehicle/VehicleTypeImplTest.java		2014-01-16 15:15:16 -05:00
..
.settings	ini	2013-06-04 10:25:47 +02:00
src	Merge branch 'master' into multiple-cap-constraints	2014-01-16 15:15:16 -05: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	eliminate "maven-enforcer-plugin (goal "enforce") is ignored by m2e"	2013-12-19 10:42:20 +01:00