diff options
author | Patrik Nyblom <[email protected]> | 2012-11-16 12:16:36 +0100 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2012-11-16 12:18:58 +0100 |
commit | 9278347678eea78419c0c310f767eaa1f4be4040 (patch) | |
tree | abfd99329547a69d714cdce86ba2a6ded031e511 /erts/preloaded/ebin/erlang.beam | |
parent | 8d0a8ed931deec5a52eaf3e63a1e99a9ed0aeba8 (diff) | |
parent | 353246f2b391aed59cf23b4e9035e7b6fb331f8c (diff) | |
download | otp-9278347678eea78419c0c310f767eaa1f4be4040.tar.gz otp-9278347678eea78419c0c310f767eaa1f4be4040.tar.bz2 otp-9278347678eea78419c0c310f767eaa1f4be4040.zip |
Merge branch 'pan/erlang-spec-error/open_port'
* pan/erlang-spec-error/open_port:
Fix spec for erlang:process_info/{1,2}
Add 'hide' option to erlang:open_port/2 spec
* Update preloaded erlang.beam
OTP-10584
OTP-9684
Diffstat (limited to 'erts/preloaded/ebin/erlang.beam')
-rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 88548 -> 88564 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 66b7a011d6..bf6d6e871b 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam |