aboutsummaryrefslogtreecommitdiffstats
path: root/erts/configure.in
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-20 11:53:39 +0200
committerHans Nilsson <[email protected]>2018-04-20 11:53:39 +0200
commit38be1e447d1a64aa528ecae2d5e957d21e069019 (patch)
tree8e57a39c8773cfe7e3c13bf14bac09241b879656 /erts/configure.in
parent21754c8d402855af5081dad0aff465a8f0f7eda7 (diff)
parent0343b68b053ee97b2ef70ea07b9aa87e8842c591 (diff)
downloadotp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.gz
otp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.bz2
otp-38be1e447d1a64aa528ecae2d5e957d21e069019.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release inets: Fix broken httpc options handling ssh: Fix server crashes for exit-normal signals ssh: Fix ssh_sftpd:handle_op not returning State Conflicts: OTP_VERSION
Diffstat (limited to 'erts/configure.in')
0 files changed, 0 insertions, 0 deletions