aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-10-01 11:39:30 +0200
committerIngela Anderton Andin <[email protected]>2010-10-01 11:39:30 +0200
commit132e46f29297ab3de25b33bd52ddbad078900276 (patch)
treef9241b069e803936f80f5d90ec06a9a5ac946e55 /lib/ssl/src/ssl_handshake.erl
parent800a07c5a386a79465ad33e5015ba20bad2ccc62 (diff)
parent9c6842dbbe45bdf1568f165cc135257c4addbe0e (diff)
downloadotp-132e46f29297ab3de25b33bd52ddbad078900276.tar.gz
otp-132e46f29297ab3de25b33bd52ddbad078900276.tar.bz2
otp-132e46f29297ab3de25b33bd52ddbad078900276.zip
Merge branch 'maint-r14' into dev
Conflicts: lib/public_key/src/pubkey_cert.erl
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
0 files changed, 0 insertions, 0 deletions