Tatsuhiro Tsujikawa e63d6e490a Merge branch 'master' into v1.0.0 ... Conflicts: lib/nghttp2_option.h lib/nghttp2_session.h src/HttpServer.cc		2015-05-08 19:21:51 +09:00
..
nghttp2	Merge branch 'master' into v1.0.0	2015-05-08 19:21:51 +09:00
Makefile.am	Replace HTTP/2.0 with HTTP/2	2014-03-30 19:26:37 +09:00