diff options
author | Erlang/OTP <[email protected]> | 2010-02-16 07:54:28 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-02-16 07:54:28 +0000 |
commit | 06113bad97bc0606841f067975d2efb001e8b240 (patch) | |
tree | df4aef09f60ab97c1993c4625d0de62a9796f090 /lib/kernel | |
parent | 333d2b2bf79db0dd7d42ec69b13aa9d820d57c10 (diff) | |
parent | 6d2d8b9c2bbd6a1c582cb936e69b4bfe491c85be (diff) | |
download | otp-06113bad97bc0606841f067975d2efb001e8b240.tar.gz otp-06113bad97bc0606841f067975d2efb001e8b240.tar.bz2 otp-06113bad97bc0606841f067975d2efb001e8b240.zip |
Merge branch 'bg/erl_bif_types' into ccase/r13b04_dev
* bg/erl_bif_types:
Add types for erts_debug:lock_counters/1
Add types for os:timestamp/0
Add types for erts_debug:dist_ext_to_term/2
erl_bif_types: add 'http_bin' as a valid packet option
OTP-8437: bg/erl_bif_types
Diffstat (limited to 'lib/kernel')
0 files changed, 0 insertions, 0 deletions