diff options
| author | Erlang/OTP <[email protected]> | 2018-05-02 15:53:28 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-05-02 15:53:28 +0200 |
| commit | 6faad4dd9c202931469bc25cea5a0e47aa0000dc (patch) | |
| tree | de6dfc83a928aaf5410fc7ae736ad601916b7347 /.mailmap | |
| parent | f2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff) | |
| parent | 05b1c13e36ec49891e89593b25e668e983a4fc41 (diff) | |
| download | otp-6faad4dd9c202931469bc25cea5a0e47aa0000dc.tar.gz otp-6faad4dd9c202931469bc25cea5a0e47aa0000dc.tar.bz2 otp-6faad4dd9c202931469bc25cea5a0e47aa0000dc.zip | |
Merge branch 'john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166' into maint-20
* john/erts/fix-heart-command-overflow/OTP-15034/ERIERL-166:
heart: Use ntohs instead of manual conversion
# Conflicts:
# lib/kernel/test/heart_SUITE.erl
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions