diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
| commit | abb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch) | |
| tree | 902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /erts/emulator/beam/atom.names | |
| parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
| parent | 235bf943d762bfdb5638d23b3270f92c50050b0a (diff) | |
| download | otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.gz otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.bz2 otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.zip | |
Merge branch 'ia/pr/758/OTP-12837' into maint
* 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/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index f9a2f3e33e..190e7817dc 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -321,6 +321,7 @@ atom ldflags atom Le='=<' atom lf atom line +atom line_delimiter atom line_length atom linked_in_driver atom links |