diff options
| author | Sverker Eriksson <[email protected]> | 2014-05-20 20:42:29 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-05-20 20:42:33 +0200 |
| commit | d4d5b4375dae706edb6deda9faebc66000aa2019 (patch) | |
| tree | 8bacb40163179f93af6e3a5a23563f89d4882078 /erts/emulator/beam/atom.names | |
| parent | 23f73961cbd2d48b019214dcba243afb80034ce9 (diff) | |
| parent | 0dbcbea0cf52672ef1cf051c3cd7640eb7ff728e (diff) | |
| download | otp-d4d5b4375dae706edb6deda9faebc66000aa2019.tar.gz otp-d4d5b4375dae706edb6deda9faebc66000aa2019.tar.bz2 otp-d4d5b4375dae706edb6deda9faebc66000aa2019.zip | |
Merge branch 'sverk/better-module-info'
OTP-11940
* sverk/better-module-info:
Remove obsolete 'imports' entry from module_info/1/2 functions
Add 'module' entry for module_info/0 function for completeness
Add 'md5' entry for module_info/0/1 functions.
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index d28e519ae1..dc930f2d38 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -278,7 +278,6 @@ atom http httph https http_response http_request http_header http_eoh http_error atom id atom if_clause atom ignore -atom imports atom in atom in_exiting atom inactive @@ -333,6 +332,7 @@ atom max atom maximum atom max_tables max_processes atom mbuf_size +atom md5 atom memory atom memory_internal atom memory_types |