aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/unix/erl_main.c
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-03 14:46:47 +0100
committerHans Nilsson <[email protected]>2017-02-03 14:46:47 +0100
commit08726ff1c6a0bfb9989034920184438aed9db8bd (patch)
tree7a28815ce03f614a505cf7118a92fb120424243e /erts/emulator/sys/unix/erl_main.c
parent7edd60122d2242c24455a3dc41b0c52519cd565a (diff)
parent2e25e7890af04d9001fa777d848ebce6d059edf2 (diff)
downloadotp-08726ff1c6a0bfb9989034920184438aed9db8bd.tar.gz
otp-08726ff1c6a0bfb9989034920184438aed9db8bd.tar.bz2
otp-08726ff1c6a0bfb9989034920184438aed9db8bd.zip
Merge branch 'hans/ssh/default_algo_list/OTP-14110'
Diffstat (limited to 'erts/emulator/sys/unix/erl_main.c')
0 files changed, 0 insertions, 0 deletions