diff options
author | Ingela Anderton Andin <[email protected]> | 2015-12-09 09:56:38 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-12-09 09:56:38 +0100 |
commit | 8f91fc9576aa4abadf7e20e5aaabec1b37832145 (patch) | |
tree | d9da25188ffaa0cef1fdae4ff5e0af0a87eda12e /erts/emulator/beam/beam_emu.c | |
parent | 0a26778f89e58b5edcbf9c2e5a55eb702ef80593 (diff) | |
parent | 80bf91029f9afcef147493a449ad0ae328efb3ae (diff) | |
download | otp-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/beam/beam_emu.c')
0 files changed, 0 insertions, 0 deletions