aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-12-09 09:56:38 +0100
committerIngela Anderton Andin <[email protected]>2015-12-09 09:56:38 +0100
commit8f91fc9576aa4abadf7e20e5aaabec1b37832145 (patch)
treed9da25188ffaa0cef1fdae4ff5e0af0a87eda12e /erts/emulator
parent0a26778f89e58b5edcbf9c2e5a55eb702ef80593 (diff)
parent80bf91029f9afcef147493a449ad0ae328efb3ae (diff)
downloadotp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.tar.gz
otp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.tar.bz2
otp-8f91fc9576aa4abadf7e20e5aaabec1b37832145.zip
Merge branch 'ia/ssl-prepare-release' into maint
* ia/ssl-prepare-release: ssl: Correct spec ssl: Prepare for release
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions