aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-03 11:33:23 +0100
committerHans Nilsson <[email protected]>2017-02-03 11:33:23 +0100
commitf0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed (patch)
treec00a87aafdd637788ba5e7321eacd234604e1ef6 /lib/ssh/src
parent73e5d40659f48b5aa7b4e25878fa0282ddb30b23 (diff)
parent79ea550fdf9ebd02c1932728dac509cd0d520a7c (diff)
downloadotp-f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed.tar.gz
otp-f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed.tar.bz2
otp-f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed.zip
Merge branch 'maint-18' into maint
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/emulator/sys/unix/erl_unix_sys.h erts/emulator/sys/unix/sys.c erts/vsn.mk lib/crypto/c_src/crypto.c lib/crypto/doc/src/notes.xml lib/crypto/vsn.mk lib/inets/doc/src/notes.xml lib/inets/vsn.mk lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.app.src lib/ssh/src/ssh_connection_handler.erl lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.app.src1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 76b7d8cd55..2bb7491b0c 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -48,4 +48,3 @@
"stdlib-3.1"
]}]}.
-