aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-11-15 16:04:39 +0100
committerSverker Eriksson <[email protected]>2018-11-15 16:04:39 +0100
commit58076e7db30a9f35df729c7e58ebcbe48003bb14 (patch)
treedad56d064313b6ad41c94a9b204ef390eeac42d9 /erts/emulator/beam/atom.names
parenteddc6f7aa1667eaefe5cb4a26a2d2afd7e96d0f6 (diff)
parentefe633d2c22daea6225935a2945fa5d3dd70e50c (diff)
downloadotp-58076e7db30a9f35df729c7e58ebcbe48003bb14.tar.gz
otp-58076e7db30a9f35df729c7e58ebcbe48003bb14.tar.bz2
otp-58076e7db30a9f35df729c7e58ebcbe48003bb14.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 0167286bbf..3f7aa0983c 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -396,6 +396,7 @@ atom microsecond
atom microstate_accounting
atom milli_seconds
atom millisecond
+atom min
atom min_heap_size
atom min_bin_vheap_size
atom minor