diff options
author | Hans Bolinder <[email protected]> | 2012-01-24 12:48:00 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2012-01-24 12:48:00 +0100 |
commit | 36f1a3fda344bc3cf32fb1616b55c254ec7aa6e7 (patch) | |
tree | 346b3c00311d7c904625227273619951bb8b2dd8 /erts/emulator/Makefile | |
parent | 2e76cc5e704bee90f114824019253be5f33766af (diff) | |
parent | 22478c78231286957c330d3151828ab75a09dcf8 (diff) | |
download | otp-36f1a3fda344bc3cf32fb1616b55c254ec7aa6e7.tar.gz otp-36f1a3fda344bc3cf32fb1616b55c254ec7aa6e7.tar.bz2 otp-36f1a3fda344bc3cf32fb1616b55c254ec7aa6e7.zip |
Merge branch 'hb/kernel/correct_contracts/OTP-9874' into maint
* hb/kernel/correct_contracts/OTP-9874:
Correct two contracts in gen_sctp.erl
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions