diff options
| author | Sverker Eriksson <[email protected]> | 2015-06-03 16:19:30 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-06-15 14:13:13 +0200 |
| commit | c09561dc51be736943a32862a41a3eaef2e41b83 (patch) | |
| tree | 0ce32c8ed890f60b936fff4682c9bf5cfc5586ee /erts/emulator/beam/atom.names | |
| parent | eea59350ddc1f8c2d86e10f5d38f0cda2f9081f3 (diff) | |
| download | otp-c09561dc51be736943a32862a41a3eaef2e41b83.tar.gz otp-c09561dc51be736943a32862a41a3eaef2e41b83.tar.bz2 otp-c09561dc51be736943a32862a41a3eaef2e41b83.zip | |
erts: Yield in maps:merge
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 |