Noah Levitt c7813938e0 Merge branch 'master' into new-fetchhttp-only ...

Conflicts:
	.classpath
	commons/src/main/java/org/archive/state/ModuleTestBase.java
	modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java

2012-12-20 11:04:42 -08:00

..

.settings

copy 'springy' branch to heritrix3

2009-05-11 22:56:36 +00:00

src

Merge branch 'master' into new-fetchhttp-only

2012-12-20 11:04:42 -08:00

.classpath

copy 'springy' branch to heritrix3

2009-05-11 22:56:36 +00:00

.project

copy 'springy' branch to heritrix3

2009-05-11 22:56:36 +00:00

pom.xml

make maven requested version match eclipse project classpath

2012-10-01 16:37:31 -07:00