aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-03-23 08:19:03 +0100
committerJohn Högberg <[email protected]>2018-03-23 08:19:03 +0100
commit7c2672e614883d8f0eac7559a59d0373ec92af69 (patch)
tree3efd77a3e47638fab644366376dffb859a9aef96 /erts/emulator/beam/atom.names
parentb302412387b094bb827ea8ae5f8f3e28178c2f8b (diff)
parentf5af4ec3aec18b7237c11ec6c8b7dd9367002d37 (diff)
downloadotp-7c2672e614883d8f0eac7559a59d0373ec92af69.tar.gz
otp-7c2672e614883d8f0eac7559a59d0373ec92af69.tar.bz2
otp-7c2672e614883d8f0eac7559a59d0373ec92af69.zip
Merge branch 'john/erts/list-installed-nifs/OTP-14965'
* john/erts/list-installed-nifs/OTP-14965: Add an option to ?MODULE:module_info/1 for listing NIFs Fix a misleading comment
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 7963386e1d..cceca66850 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -673,3 +673,4 @@ atom xor
atom x86
atom yes
atom yield
+atom nifs