Joakim Erdfelt 37738d15e5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project ...

Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java

2015-04-29 18:12:04 -07:00

..

src

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

2015-04-29 18:12:04 -07:00

.gitignore

…

pom.xml

Build under Java 1.8

2015-04-10 13:21:12 -07:00