Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-websocket/src/test
History
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
 		2012-11-08 14:58:10 +11:00
..
java/org/eclipse/jetty/websocket Merge remote-tracking branch 'origin/jetty-8' 2012-11-08 14:58:10 +11:00
resources Merge remote-tracking branch 'origin/jetty-8' 2012-11-02 14:08:05 +11:00