nmittler 054e4c5233 Merge branch 'master' of https://github.com/netty/netty into http2 ... Conflicts: example/src/main/java/io/netty/example/http2/client/Http2Client.java example/src/main/java/io/netty/example/http2/client/Http2ClientInitializer.java example/src/main/java/io/netty/example/http2/server/Http2Server.java example/src/main/java/io/netty/example/http2/server/Http2ServerInitializer.java		2014-05-21 07:44:18 -07:00
..
src	Merge branch 'master' of https://github.com/netty/netty into http2	2014-05-21 07:44:18 -07:00
pom.xml	Add support for HTTP/2 draft 12.	2014-05-06 20:22:27 +02:00