diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:49:42 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:49:42 +0200 |
| commit | c54a0025e6a4d152ba73e92a2007052ebde391bf (patch) | |
| tree | 96547f56d48c53d197a5a70acd167c0bdcdaf4af /erts/emulator/beam/atom.names | |
| parent | d30fd47e2e886094d72d8dcb00f1392cabeda23f (diff) | |
| parent | 8b4659d5246166cef9b8e9aa91c644e3b3ec66d5 (diff) | |
| download | otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.gz otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.tar.bz2 otp-c54a0025e6a4d152ba73e92a2007052ebde391bf.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index dc930f2d38..721a1ff219 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -116,6 +116,7 @@ atom binary_longest_prefix_trap atom binary_longest_suffix_trap atom binary_match_trap atom binary_matches_trap +atom binary_to_list_continue atom binary_to_term_trap atom block atom blocked @@ -314,6 +315,7 @@ atom line_length atom linked_in_driver atom links atom list +atom list_to_binary_continue atom little atom loaded atom load_cancelled |