aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2018-08-23 10:17:12 +0200
committerLars Thorsen <[email protected]>2018-08-23 10:17:12 +0200
commit4479223613dc6a0e82059c310b13fd072b9e31a3 (patch)
treeb4a9c8b3c92113d31353ba5a66b1813bc24d498c /lib/ssh/src
parent5ed84b869a3f54a7132932226a72b6f5dd6f7457 (diff)
parent8bb0d5d4049b6b2ec41f6cc3e154e9f688029bef (diff)
downloadotp-4479223613dc6a0e82059c310b13fd072b9e31a3.tar.gz
otp-4479223613dc6a0e82059c310b13fd072b9e31a3.tar.bz2
otp-4479223613dc6a0e82059c310b13fd072b9e31a3.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release Updated the engine load functionality Clean up bag index tables Conflicts: OTP_VERSION lib/crypto/c_src/crypto.c lib/crypto/doc/src/notes.xml lib/crypto/vsn.mk lib/mnesia/doc/src/notes.xml lib/mnesia/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssh/src')
0 files changed, 0 insertions, 0 deletions