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/doc/src/ref_man.xml | |
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/doc/src/ref_man.xml')
-rw-r--r-- | erts/doc/src/ref_man.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml index ff64aa86b8..a78aaa449e 100644 --- a/erts/doc/src/ref_man.xml +++ b/erts/doc/src/ref_man.xml @@ -50,5 +50,7 @@ <xi:include href="erts_alloc.xml"/> <xi:include href="erl_nif.xml"/> <xi:include href="erl_tracer.xml"/> + <xi:include href="atomics.xml"/> + <xi:include href="counters.xml"/> </application> |