diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:22:36 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:22:36 +0200 |
| commit | bb915519aa16f6410b19c6f868805b47717f11fa (patch) | |
| tree | 02171f62ff06e14586a803b6a69c885978137cd8 /erts/emulator/beam/atom.names | |
| parent | 49b7b5d5158f89fb4bee068719d000d6c753fdcd (diff) | |
| parent | d5733bc3e34449affde2594d85b905c8ab440d42 (diff) | |
| download | otp-bb915519aa16f6410b19c6f868805b47717f11fa.tar.gz otp-bb915519aa16f6410b19c6f868805b47717f11fa.tar.bz2 otp-bb915519aa16f6410b19c6f868805b47717f11fa.zip | |
Merge branch 'maint'
Conflicts:
erts/etc/common/heart.c
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 106fad030b..afcbd732df 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -252,6 +252,7 @@ atom heap_block_size atom heap_size atom heap_sizes atom heap_type +atom heart_port atom heir atom hidden atom hide |