jetty.project/tests/test-integration
Jan Bartel 50a67eac6a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
	jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
2013-07-25 13:22:14 +10:00
..
src/test Merge remote-tracking branch 'origin/jetty-8' 2013-07-25 13:22:14 +10:00
pom.xml [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00