diff options
author | Hans Nilsson <[email protected]> | 2018-04-06 12:21:01 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-04-06 12:21:01 +0200 |
commit | 61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622 (patch) | |
tree | b04a96a35dd4d06d1f936717fc5b8bd7cfbb3bcc /.dir-locals.el | |
parent | 6b31b88f74bf7194bed5df72eeabda3cc645a39c (diff) | |
parent | 90edf69ba7acbfaa55a709fa115ce8bb782b9dc9 (diff) | |
download | otp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.tar.gz otp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.tar.bz2 otp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.zip |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Prepare release
ssh: Fix ssh_sftpd:handle_op not returning State
Conflicts:
OTP_VERSION
lib/ssh/doc/src/notes.xml
lib/ssh/vsn.mk
otp_versions.table
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions