aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/ebin
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-12-01 07:59:41 +0100
committerJohn Högberg <[email protected]>2017-12-01 07:59:41 +0100
commit76c4821cff1e91c26dd2f812fc8cb40aa7d48e57 (patch)
tree3b2fefd934522721c30735766d82974460809256 /erts/preloaded/ebin
parent93cc4a79c3c2bf6eb9489558795da726f141ed06 (diff)
parent0278c9873ffc277c9a940d6f5cae1508a6685c7b (diff)
downloadotp-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.beambin54704 -> 54268 bytes
-rw-r--r--erts/preloaded/ebin/init.beambin50348 -> 50472 bytes
-rw-r--r--erts/preloaded/ebin/prim_buffer.beambin0 -> 3620 bytes
-rw-r--r--erts/preloaded/ebin/prim_file.beambin43956 -> 27428 bytes
-rw-r--r--erts/preloaded/ebin/prim_inet.beambin75988 -> 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
index 198032c18d..2d86dd3843 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
Binary files differ
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index fb4fc67148..a2dd41b435 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_buffer.beam b/erts/preloaded/ebin/prim_buffer.beam
new file mode 100644
index 0000000000..06d9276247
--- /dev/null
+++ b/erts/preloaded/ebin/prim_buffer.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index eb326ac4b6..902b0945c6 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index 32b104ae95..a42f45c180 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
Binary files differ