diff options
author | John Högberg <[email protected]> | 2017-12-01 07:59:41 +0100 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-12-01 07:59:41 +0100 |
commit | 76c4821cff1e91c26dd2f812fc8cb40aa7d48e57 (patch) | |
tree | 3b2fefd934522721c30735766d82974460809256 /erts/preloaded/ebin | |
parent | 93cc4a79c3c2bf6eb9489558795da726f141ed06 (diff) | |
parent | 0278c9873ffc277c9a940d6f5cae1508a6685c7b (diff) | |
download | otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.tar.gz otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.tar.bz2 otp-76c4821cff1e91c26dd2f812fc8cb40aa7d48e57.zip |
Merge branch 'john/erts/efile-nif'
OTP-14256
OTP-14797
Diffstat (limited to 'erts/preloaded/ebin')
-rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 54704 -> 54268 bytes |
-rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 50348 -> 50472 bytes |
-rw-r--r-- | erts/preloaded/ebin/prim_buffer.beam | bin | 0 -> 3620 bytes |
-rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 43956 -> 27428 bytes |
-rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 75988 -> 77928 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex 198032c18d..2d86dd3843 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex fb4fc67148..a2dd41b435 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam diff --git a/erts/preloaded/ebin/prim_buffer.beam b/erts/preloaded/ebin/prim_buffer.beam Binary files differnew file mode 100644 index 0000000000..06d9276247 --- /dev/null +++ b/erts/preloaded/ebin/prim_buffer.beam diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex eb326ac4b6..902b0945c6 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex 32b104ae95..a42f45c180 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam |