diff options
author | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-11-15 15:48:38 +0100 |
commit | efe633d2c22daea6225935a2945fa5d3dd70e50c (patch) | |
tree | 7f111f09a6c261be777831578adb8aad6b970c9e /erts/preloaded/src/erts.app.src | |
parent | 870ff6a1ec52003b8b67d3bbfaf68a28184bd0b6 (diff) | |
parent | fefb5d039e87ff7137e78b3d5f2eaf01e498ec4d (diff) | |
download | otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.gz otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.tar.bz2 otp-efe633d2c22daea6225935a2945fa5d3dd70e50c.zip |
Merge branch 'sverker/erts/atomics-counters/OTP-13468' into maint
* sverker/erts/atomics-counters/OTP-13468:
erts: Add new module 'counters'
erts: Add new module 'atomics'
Diffstat (limited to 'erts/preloaded/src/erts.app.src')
-rw-r--r-- | erts/preloaded/src/erts.app.src | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src index 8c34c99a98..ed645d1191 100644 --- a/erts/preloaded/src/erts.app.src +++ b/erts/preloaded/src/erts.app.src @@ -33,12 +33,14 @@ prim_file, prim_inet, prim_zip, + atomics, + counters, zlib ]}, {registered, []}, {applications, []}, {env, []}, - {runtime_dependencies, ["stdlib-3.5", "kernel-6.1", "sasl-3.0.1"]} + {runtime_dependencies, ["stdlib-3.5", "kernel-6.1", "sasl-@OTP-13468@"]} ]}. %% vim: ft=erlang |