diff options
| author | Rickard Green <[email protected]> | 2013-11-28 15:10:35 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-11-28 15:10:35 +0100 |
| commit | 23a30d882464df4210ea53096ea50e7b44876812 (patch) | |
| tree | efbc5e97dc55e63b6e194921007f88e651960764 /lib/test_server/src/test_server_ctrl.erl | |
| parent | 8bc2bac6b60724c2b454bf572ab13146a7154b2f (diff) | |
| parent | 9f998969014095333545cb118467e1ff8d450c31 (diff) | |
| download | otp-23a30d882464df4210ea53096ea50e7b44876812.tar.gz otp-23a30d882464df4210ea53096ea50e7b44876812.tar.bz2 otp-23a30d882464df4210ea53096ea50e7b44876812.zip | |
Merge branch 'maint'
* maint:
Fix prim_inet:close/1
Ensure exit signal due to link precede port BIF return
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
0 files changed, 0 insertions, 0 deletions