aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-04-10 20:45:47 +0200
committerSverker Eriksson <[email protected]>2014-04-10 20:45:47 +0200
commitbee0ea4125e8b47478b77904bee06f8f38bbab42 (patch)
treedbeaaa41c6d8a96a14bd4ab4a330f30d24fa69c0 /lib/ssl
parentfc2b873cc6236841f73afdcdc5ac81105a9a3cd3 (diff)
parent9e19d1bf9fc7dc322823327e5e78f4ec0c3cee37 (diff)
downloadotp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.gz
otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.bz2
otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'lib/ssl')
0 files changed, 0 insertions, 0 deletions