aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-19 12:01:21 +0100
committerFredrik Gustafsson <[email protected]>2013-03-19 12:01:21 +0100
commit487116a505a4346ea9e951a92fa17eea294bd177 (patch)
treee8434cb7fe51adc3d4bc51c5fbe4fff9f21de3cd /erts/include
parentab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0 (diff)
parent57ade3a03d5bc56abebd172ced05520cbe5185f7 (diff)
downloadotp-487116a505a4346ea9e951a92fa17eea294bd177.tar.gz
otp-487116a505a4346ea9e951a92fa17eea294bd177.tar.bz2
otp-487116a505a4346ea9e951a92fa17eea294bd177.zip
Merge branch 'jb/ssl/fix-ssl-npn-doc/OTP-10955' into maint
* jb/ssl/fix-ssl-npn-doc/OTP-10955: Fix SSL Next Protocol Negotiation documentation
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions