jetty.project/jetty-osgi/jetty-osgi-boot-jsp
Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2014-11-27 13:34:45 +11:00
..
src/main/java/org/eclipse/jetty/osgi/boot 451529 Change sentinel class for finding jstl on classpath to org.apache.taglibs.standard.tag.rt.core.WhenTag 2014-11-19 17:20:55 +11:00
build.properties updated to patch from 20091210 2009-12-11 03:27:18 +00:00
pom.xml Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-27 13:34:45 +11:00