Greg Wilkins 59540abeda Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java		2013-08-22 22:58:58 +10:00
..
src	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-08-22 22:58:58 +10:00
pom.xml	Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.	2013-07-12 13:53:58 +10:00