diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
| commit | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (patch) | |
| tree | 85311be5c695d5aea5602bb5ba6f8308b3e4b69e /erts/emulator/beam/atom.names | |
| parent | a7f0387da9aa6cf469a02caf071e20120d3bad87 (diff) | |
| parent | c6fe4731a9093166ff41d16900d22808b5a68053 (diff) | |
| download | otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.gz otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.bz2 otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 7d86e486f1..3ee9eb0f88 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -178,6 +178,7 @@ atom disable_trace atom disabled atom display_items atom dist +atom dist_cmd atom Div='/' atom div atom dlink @@ -313,6 +314,7 @@ atom load_cancelled atom load_failure atom local atom long_gc +atom long_schedule atom low atom Lt='<' atom machine @@ -432,6 +434,7 @@ atom port atom ports atom port_count atom port_limit +atom port_op atom print atom priority atom private @@ -443,6 +446,7 @@ atom process_display atom process_limit atom process_dump atom procs +atom proc_sig atom profile atom protected atom protection |