diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-15 14:28:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-15 14:28:34 +0200 |
| commit | 0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63 (patch) | |
| tree | 5055b6e83a3ee509316459d0f1b195605c784ffa /erts/emulator/beam/atom.names | |
| parent | b130093994e7bfe45c92579af3068558e45a6c30 (diff) | |
| parent | f7ef9fb1679fcd46c48ec5f8a968f7e053b3d4ed (diff) | |
| download | otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.tar.gz otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.tar.bz2 otp-0aa4393922d7f69aa4fb7a7dd30ad8dba1076c63.zip | |
Merge branch 'sverk/map-merge-trap'
* sverk/map-merge-trap:
erts: Optimize maps:merge
erts: Yield in maps:merge
erts: Refactor arg swapping for maps:merge
erts: Add save/restore for PSTACK
erts: Fix magic binary alignment on 32-bit
erts: Add maps to send_term_SUITE
erts: Fix calculation of reclaimed data during full gc
erts: Fix warning about const pointer to make_boxed and make_list
erts: Fix typo in etp-carrier-blocks
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 5ec1409adf..74b42c647e 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -350,6 +350,7 @@ atom message atom message_binary atom message_queue_len atom messages +atom merge_trap atom meta atom meta_match_spec atom micro_seconds |