diff options
| author | Lukas Larsson <[email protected]> | 2018-12-20 10:18:36 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-12-20 10:18:36 +0100 |
| commit | c70717d44859068cd9f8085b9aeb6956ab98bcc0 (patch) | |
| tree | 756a3719f7800922e148b5d29da78114a81d9401 /erts/emulator/beam/atom.names | |
| parent | 12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724 (diff) | |
| parent | d27a7569a73480c8c800888923a0cdb7cb29356f (diff) | |
| download | otp-c70717d44859068cd9f8085b9aeb6956ab98bcc0.tar.gz otp-c70717d44859068cd9f8085b9aeb6956ab98bcc0.tar.bz2 otp-c70717d44859068cd9f8085b9aeb6956ab98bcc0.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/atomics.beam
erts/preloaded/ebin/counters.beam
erts/preloaded/ebin/erl_prim_loader.beam
erts/preloaded/ebin/erl_tracer.beam
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_code_purger.beam
erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/erts_literal_area_collector.beam
erts/preloaded/ebin/init.beam
erts/preloaded/ebin/otp_ring0.beam
erts/preloaded/ebin/persistent_term.beam
erts/preloaded/ebin/prim_buffer.beam
erts/preloaded/ebin/prim_eval.beam
erts/preloaded/ebin/prim_file.beam
erts/preloaded/ebin/prim_inet.beam
erts/preloaded/ebin/prim_zip.beam
erts/preloaded/ebin/zlib.beam
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 3f7aa0983c..f81082a698 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -546,6 +546,7 @@ atom reload atom rem atom report_errors atom reset +atom reset_seq_trace atom restart atom return_from atom return_to |