diff options
author | Rickard Green <[email protected]> | 2013-06-10 15:22:50 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2013-06-10 15:22:50 +0200 |
commit | 9919508b2cc177ec4afdb53bb9d20563973461f8 (patch) | |
tree | c0defa28e72c3f4afefc17d8964c811b5f53caa4 /lib/ssl/src | |
parent | 4d268f98716dfab50b5a42d8ed88c4c9b13fb557 (diff) | |
parent | 75fbf54df767358e9c3a997ff9a46b994102a0d0 (diff) | |
download | otp-9919508b2cc177ec4afdb53bb9d20563973461f8.tar.gz otp-9919508b2cc177ec4afdb53bb9d20563973461f8.tar.bz2 otp-9919508b2cc177ec4afdb53bb9d20563973461f8.zip |
Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maint
* rickard-sverker/carrier-migration/OTP-10279:
erts: Fix warning
erts: Fix management of redirected carrier to deallocate
Diffstat (limited to 'lib/ssl/src')
0 files changed, 0 insertions, 0 deletions