aboutsummaryrefslogtreecommitdiffstats
path: root/erts/Makefile
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-24 08:50:32 +0200
committerJohn Högberg <[email protected]>2018-07-24 08:50:32 +0200
commit958ad184c843ce32497eef319f10db7a3a3759c2 (patch)
tree88a0ef27657e3f8eb0a1a85a7019139220247b2a /erts/Makefile
parent408352c6c2c484c6100a02d86f163d2dc814f542 (diff)
parent107c492a5e3ebe315d68f9438191f2b0c2d37e5b (diff)
downloadotp-958ad184c843ce32497eef319f10db7a3a3759c2.tar.gz
otp-958ad184c843ce32497eef319f10db7a3a3759c2.tar.bz2
otp-958ad184c843ce32497eef319f10db7a3a3759c2.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssl: Engine key trumps certfile option inets: Prepare for release inets: Improve error handling
Diffstat (limited to 'erts/Makefile')
0 files changed, 0 insertions, 0 deletions