diff options
| author | Erlang/OTP <[email protected]> | 2018-08-10 19:02:27 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-08-10 19:02:27 +0200 |
| commit | c1746bbc5ba842b3cf7e37932185e2788db874a4 (patch) | |
| tree | 29f32eb271e2451739bb6a28d64feb32819310f8 /make | |
| parent | 2c1ca1cc79063cc76befb00ad1ccd16efbd470c2 (diff) | |
| parent | 83ce2a8e8da4aab4578f589e6af6e5c93bcdaebe (diff) | |
| download | otp-c1746bbc5ba842b3cf7e37932185e2788db874a4.tar.gz otp-c1746bbc5ba842b3cf7e37932185e2788db874a4.tar.bz2 otp-c1746bbc5ba842b3cf7e37932185e2788db874a4.zip | |
Merge branch 'rickard/full-cache-nif-env/OTP-15223/ERL-695' into maint-21
* rickard/full-cache-nif-env/OTP-15223/ERL-695:
Fix caching of NIF environment when executing dirty
# Conflicts:
# erts/emulator/beam/erl_nif.c
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions