diff options
| author | Patrik Nyblom <[email protected]> | 2012-02-07 19:51:24 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-02-07 19:51:24 +0100 |
| commit | d0394af6541d99bd72192d35fc4986016c3a6589 (patch) | |
| tree | 8251b6147db0ea64f90b25b941d951c58bb150a2 /erts/emulator/beam/atom.names | |
| parent | e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1 (diff) | |
| parent | 6004ec3e1785913ff0b74054cf614a35c180d54a (diff) | |
| download | otp-d0394af6541d99bd72192d35fc4986016c3a6589.tar.gz otp-d0394af6541d99bd72192d35fc4986016c3a6589.tar.bz2 otp-d0394af6541d99bd72192d35fc4986016c3a6589.zip | |
Merge branch 'maint'
Conflicts:
erts/doc/src/erlang.xml
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 71454b3e57..7be40976f6 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -95,6 +95,7 @@ atom atom atom atom_used atom attributes atom await_proc_exit +atom await_sched_wall_time_modifications atom awaiting_load atom awaiting_unload atom backtrace backtrace_depth @@ -239,6 +240,7 @@ atom generational atom get_seq_token atom get_tcw atom getenv +atom gather_sched_wall_time_result atom getting_linked atom getting_unlinked atom global @@ -554,6 +556,7 @@ atom waiting atom wall_clock atom warning atom warning_msg +atom scheduler_wall_time atom wordsize atom write_concurrency atom xor |