aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-06-08 14:48:27 +0200
committerRickard Green <[email protected]>2017-06-08 14:48:27 +0200
commit4b258844c4c0a9102d95cb03d7e1c4e58e147987 (patch)
treea10b561721475ee593b03c543b3cfd65b6b9a7e2 /erts/emulator/beam/erl_nif.c
parenteefca18e8bed9f41ce65ae79fb1a5b614accbfde (diff)
parent94379b22116ec5d1efd56a0ace837054b3da6fa2 (diff)
downloadotp-4b258844c4c0a9102d95cb03d7e1c4e58e147987.tar.gz
otp-4b258844c4c0a9102d95cb03d7e1c4e58e147987.tar.bz2
otp-4b258844c4c0a9102d95cb03d7e1c4e58e147987.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers erts: Fix so that 81b628 (sigterm=kill) works Updated OTP version Prepare release Unconditionally clear IO buffers on send/shutdown errors Conflicts: OTP_VERSION erts/emulator/sys/unix/sys.c erts/vsn.mk
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
0 files changed, 0 insertions, 0 deletions