diff options
author | Raimo Niskanen <[email protected]> | 2018-08-03 12:08:06 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2018-08-03 12:56:29 +0200 |
commit | fa6f32fa647a02e1735fca868b589c1f8b2ac5f8 (patch) | |
tree | 6371435920397489e55eb3334b381fed17bbff5d /lib/inets/doc/src/inets.xml | |
parent | 0ae934aa008f9ff2a929eafc52811fcde619631a (diff) | |
parent | 757057b32f60fc1626af9593b49975f40fcceefd (diff) | |
download | otp-fa6f32fa647a02e1735fca868b589c1f8b2ac5f8.tar.gz otp-fa6f32fa647a02e1735fca868b589c1f8b2ac5f8.tar.bz2 otp-fa6f32fa647a02e1735fca868b589c1f8b2ac5f8.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
Fix NIF stack recursion bug and enforce a limit
Conflicts:
OTP_VERSION
lib/asn1/doc/src/notes.xml
lib/asn1/vsn.mk
otp_versions.table
Diffstat (limited to 'lib/inets/doc/src/inets.xml')
0 files changed, 0 insertions, 0 deletions