Jan Bartel 246088c2ee Merge remote-tracking branch 'origin/jetty-8' ... Conflicts: jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java		2013-02-14 20:08:37 +11:00
..
src	Merge remote-tracking branch 'origin/jetty-8'	2013-02-14 20:08:37 +11:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-02-05 10:00:36 -07:00