aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-03-05 12:18:54 +0100
committerHans Nilsson <[email protected]>2018-03-05 12:18:54 +0100
commit45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04 (patch)
tree563ffc46d0de9defdcc68545e939332b1ebeb27f /erts/emulator
parent073829d18ada35a18ff681f891b0d4fbfbff5c2f (diff)
parentba3710484344ed57124574abcd0f19fbe251389c (diff)
downloadotp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.tar.gz
otp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.tar.bz2
otp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Update release notes Update version numbers ssh: Fix cli ssh: Test for disabled shell Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.erl lib/ssh/src/ssh_cli.erl lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions