aboutsummaryrefslogtreecommitdiffstats
path: root/TAR.include
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-08-15 11:11:12 +0200
committerIngela Anderton Andin <[email protected]>2018-08-15 11:11:12 +0200
commitb20087d24c30331ceb314650a4128c6345e11f61 (patch)
treefb10aef76e2bbc8758cf53227198526931e0229f /TAR.include
parent621cf67c97c89e18399ec6a21dde2c6275493b5e (diff)
parent70aceaec7a985c27787f37ce07e4b072ec52ed61 (diff)
downloadotp-b20087d24c30331ceb314650a4128c6345e11f61.tar.gz
otp-b20087d24c30331ceb314650a4128c6345e11f61.tar.bz2
otp-b20087d24c30331ceb314650a4128c6345e11f61.zip
Merge branch 'maint-20' into maint
* maint-20: inets: Remove 21 test case Updated OTP version Update release notes Conflicts: OTP_VERSION lib/inets/doc/src/notes.xml lib/inets/test/httpd_SUITE.erl lib/inets/vsn.mk otp_versions.table
Diffstat (limited to 'TAR.include')
0 files changed, 0 insertions, 0 deletions