aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/ebin/erlang.beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-05-16 17:55:39 +0200
committerRickard Green <[email protected]>2013-05-16 17:55:39 +0200
commit92092987b6470969f9ddc1dba8fdf49e7f8724fc (patch)
treeeb0befb3545266d1c2434b89ef6e40295476da2a /erts/preloaded/ebin/erlang.beam
parentbbb2760fa436ae7e7b7d003252e83a24e4f6cb8a (diff)
parent1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (diff)
downloadotp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.gz
otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.tar.bz2
otp-92092987b6470969f9ddc1dba8fdf49e7f8724fc.zip
Merge branch 'maint'
* maint: Only verify not busy for erlang:send(Port, Msg, [nosuspend]) until scheduled Make high_msgq_watermark and low_msgq_watermark generic inet options Do not treat port_set_data/port_get_data as signals Add 'frmptr' emulator type Conflicts: erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'erts/preloaded/ebin/erlang.beam')
-rw-r--r--erts/preloaded/ebin/erlang.beambin93348 -> 92912 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 0476f75099..01d4ab9dd1 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ