diff options
author | John Högberg <[email protected]> | 2019-05-29 12:48:49 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-05-29 12:48:49 +0200 |
commit | 247529ce5cb50cd9e645d3658e20420b8cf5263b (patch) | |
tree | a2d447dbdeabeefb531462073cf8e4d3418dd161 /erts/emulator/nifs/common/socket_nif.c | |
parent | 63f91c15f7b6e1cc5d437964b5edb196630a29a4 (diff) | |
parent | 85e8792fb2f7692147a63987d0d6da7dcb812e34 (diff) | |
download | otp-247529ce5cb50cd9e645d3658e20420b8cf5263b.tar.gz otp-247529ce5cb50cd9e645d3658e20420b8cf5263b.tar.bz2 otp-247529ce5cb50cd9e645d3658e20420b8cf5263b.zip |
Merge branch 'john/update-maint-22-bootstrap' into maint
* john/update-maint-22-bootstrap:
Update primary bootstrap
Diffstat (limited to 'erts/emulator/nifs/common/socket_nif.c')
0 files changed, 0 insertions, 0 deletions