diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-10-27 09:46:09 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-10-27 09:46:09 +0100 |
| commit | 7908256c72e4a110154c2db61220973fff511614 (patch) | |
| tree | 4a907c3580e1b037cfc80f0ed87472366ddbf729 /erts/etc | |
| parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
| parent | 61d214cff5fe50b2806f8f977d36bccd412bcfc4 (diff) | |
| download | otp-7908256c72e4a110154c2db61220973fff511614.tar.gz otp-7908256c72e4a110154c2db61220973fff511614.tar.bz2 otp-7908256c72e4a110154c2db61220973fff511614.zip | |
Merge branch 'preloaded/ia/pr/758/OTP-12837' into maint
* preloaded/ia/pr/758/OTP-12837:
erts: Include test in group so that it is run
erts: Clarify documentation
erts: Add {line_delimiter, byte()} option to inet:setopts/2
Diffstat (limited to 'erts/etc')
0 files changed, 0 insertions, 0 deletions