diff options
| author | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
| commit | 3f2eea83dd133c597580d7c2b5056bc90219d025 (patch) | |
| tree | f46ad339fc2b21f3bd0c1260b06e218ebd4550fb /erts/emulator/beam/atom.names | |
| parent | ea8064b1bbda0ef59420ec8a805f3ee52630d704 (diff) | |
| parent | d9e0f376b36baa5453717606f373daa5b7a1b0aa (diff) | |
| download | otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.gz otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.bz2 otp-3f2eea83dd133c597580d7c2b5056bc90219d025.zip | |
Merge branch 'lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267'
* lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267:
runtime_tools: Fix erl_tracer testcases
runtime_tools: Fix documentation for dbg:p
erts: Move tracer SecondTraceTerm to Opts map
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 8f65e71531..7fdce62bd1 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -228,9 +228,6 @@ atom endian atom env atom eof atom eol -atom exception_from -atom exception_trace -atom extended atom Eq='=:=' atom Eqeq='==' atom erl_tracer @@ -243,6 +240,8 @@ atom ets atom ETS_TRANSFER='ETS-TRANSFER' atom event atom exact_reductions +atom exception_from +atom exception_trace atom exclusive atom exit_status atom existing @@ -251,7 +250,9 @@ atom existing_ports atom existing atom exiting atom exports +atom extended atom external +atom extra atom false atom fcgi atom fd |