diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-05 16:11:31 +0200 |
| commit | 502ed5fd6bd36328d6be63c68ee2a56738ced058 (patch) | |
| tree | 80cfb83dd63ffa876541740cc067ea05bb39118d /erts/emulator/beam/atom.names | |
| parent | cf102c1b1225450e7918a6119b7d949eb7e575c4 (diff) | |
| parent | 0bac72a18e8a5f6a46baae9c9ac73bde32948ff6 (diff) | |
| download | otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.gz otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.tar.bz2 otp-502ed5fd6bd36328d6be63c68ee2a56738ced058.zip | |
Merge branch 'master' into sverker/master/load_nif-print-init-error
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 2b66bf6f4e..66af05c1f2 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -366,6 +366,7 @@ atom long_schedule atom low atom Lt='<' atom machine +atom major atom match atom match_limit atom match_limit_recursion @@ -395,6 +396,7 @@ atom milli_seconds atom millisecond atom min_heap_size atom min_bin_vheap_size +atom minor atom minor_version atom Minus='-' atom module |