aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-03-08 14:49:04 +0100
committerErlang/OTP <[email protected]>2013-03-08 14:49:04 +0100
commitcda401b58a3db7213eb14197680d401fd1399de9 (patch)
treecef8d921785f09fda3693c552761e12770e79d2e /erts/emulator
parent79719be40f24b300d85735629c26db73c2d603a1 (diff)
parent6b6d5b245bba849b84fdfb37dbbf88693c4ce97f (diff)
downloadotp-cda401b58a3db7213eb14197680d401fd1399de9.tar.gz
otp-cda401b58a3db7213eb14197680d401fd1399de9.tar.bz2
otp-cda401b58a3db7213eb14197680d401fd1399de9.zip
Merge branch 'fredrik/ssh/fix-rekeying/OTP-10911' into maint-r16
* fredrik/ssh/fix-rekeying/OTP-10911: Fixed appup for 2.1.5 Conflicts: lib/ssh/src/ssh.appup.src
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions