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/websocket-client
History
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
 		2015-01-08 15:21:01 +01:00
..
src Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 2015-01-08 15:21:01 +01:00
pom.xml [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00