diff options
author | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:11:07 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:11:07 +0200 |
commit | f32197cc5342b5012b960711d6824dd694524e70 (patch) | |
tree | 2ff113c5fa75288736d50df15c8df08453f2b433 /README.md.txt | |
parent | 49846524934f74abcd44bbc315d9314c940d34ba (diff) | |
parent | ee679e41535dd83aba7c8fb55fa12bdc6e89313c (diff) | |
download | otp-f32197cc5342b5012b960711d6824dd694524e70.tar.gz otp-f32197cc5342b5012b960711d6824dd694524e70.tar.bz2 otp-f32197cc5342b5012b960711d6824dd694524e70.zip |
Merge branch 'dev' into major
* dev:
Use erlang:send_after instead of timer:send_after
Handle inet:getopts/2 and inet:setopts/2 crashes
Diffstat (limited to 'README.md.txt')
0 files changed, 0 insertions, 0 deletions