diff options
author | Hans Bolinder <[email protected]> | 2011-07-06 09:53:11 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2011-07-06 09:53:11 +0200 |
commit | db8cbaf6ee77aca55823f080fbcb1eea5cf2c208 (patch) | |
tree | e5889d79764935339571cb06fe15851708d6cd35 /erts/preloaded | |
parent | 6b96ae3505ebf15f9d12f3bb353ec6b80afa80b8 (diff) | |
parent | e1ad871bf09949b106d4621f2e2bf11e07098213 (diff) | |
download | otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.tar.gz otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.tar.bz2 otp-db8cbaf6ee77aca55823f080fbcb1eea5cf2c208.zip |
Merge branch 'dev' into major
* dev:
Correct the contract of io_lib:fread/2,3
Diffstat (limited to 'erts/preloaded')
0 files changed, 0 insertions, 0 deletions