Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-start/src/main/java/org/eclipse/jetty/start/Main.java jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java		2013-09-09 15:41:17 +10:00
..
jettyhome	409801 Jetty should allow webdefault to be specified using a relative location when running in OSGi	2013-06-11 18:39:15 +10:00
src/main/java/org/eclipse/jetty/osgi	[Bug 415999] Fix some of FindBugs warnings	2013-09-09 00:24:31 -04:00
build.properties	clean	2010-06-10 22:55:47 +00:00
pom.xml	Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build.	2013-09-02 17:14:17 +10:00