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-spdy
History
Greg Wilkins 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
 		2014-09-04 17:43:18 +10:00
..
spdy-alpn-tests cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
spdy-client Merged branch 'master' into 'jetty-http2'. 2014-09-01 11:57:09 +02:00
spdy-core cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
spdy-example-webapp cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
spdy-http-client-transport cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
spdy-http-common cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
spdy-http-server Merge remote-tracking branch 'origin/master' into jetty-http2 2014-09-04 17:43:18 +10:00
spdy-npn-tests Moved NPNModuleTest to module 'jetty-npn-server'. 2014-08-21 15:18:10 +02:00
spdy-server cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
pom.xml cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00