aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-08-05 14:27:11 +0200
committerHans Nilsson <[email protected]>2016-08-05 14:27:11 +0200
commite43e82802735f2fd0d6d67308e7602c37ac70898 (patch)
treeb43051d5e5b8797238c3bee89f22e635af9dce67 /erts
parent65266b2db99ea2651606acd3a796738f1a59dc40 (diff)
parente7966ef5cb0c2337a674d8cdca7c89802fa01bf6 (diff)
downloadotp-e43e82802735f2fd0d6d67308e7602c37ac70898.tar.gz
otp-e43e82802735f2fd0d6d67308e7602c37ac70898.tar.bz2
otp-e43e82802735f2fd0d6d67308e7602c37ac70898.zip
Merge branch 'maint-18' into maint
Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/test/ssh_sup_SUITE.erl lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions