aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_bif_os.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2010-11-24 18:17:33 +0100
committerSverker Eriksson <[email protected]>2010-11-24 18:17:33 +0100
commite15ad4355d1fcbc73454ebc3ce8350a2c9f05069 (patch)
tree515d8eeabe2c9e78e931e901e0d62247288a23d5 /erts/emulator/beam/erl_bif_os.c
parentba4e0b4471bfcd748499bd035b5afac058104b5f (diff)
parentb9b96221a6ecb1f0fff06e842045e744bd6bd055 (diff)
downloadotp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.tar.gz
otp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.tar.bz2
otp-e15ad4355d1fcbc73454ebc3ce8350a2c9f05069.zip
Merge branch 'sverker/crypto_aes_ctr_cmac/OTP-8752' into dev
* sverker/crypto_aes_ctr_cmac/OTP-8752: Fix nif_SUITE to not assume that it is the only one loading NIFs. crypto CTR support
Diffstat (limited to 'erts/emulator/beam/erl_bif_os.c')
0 files changed, 0 insertions, 0 deletions