diff options
author | John Högberg <[email protected]> | 2019-07-10 10:11:17 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-07-10 10:11:17 +0200 |
commit | 4e9792256a754ff10f6a214f582fbb58e081deb2 (patch) | |
tree | b9648e94ed7214ba2ed548664bc18eb8f4ff7027 /erts/epmd/src/epmd.h | |
parent | bf93aa02d98c8d4448b271cac88d6e6b3455f166 (diff) | |
parent | fa5e2cae48323a391ff65512a972d6c9f4ba4119 (diff) | |
download | otp-4e9792256a754ff10f6a214f582fbb58e081deb2.tar.gz otp-4e9792256a754ff10f6a214f582fbb58e081deb2.tar.bz2 otp-4e9792256a754ff10f6a214f582fbb58e081deb2.zip |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'erts/epmd/src/epmd.h')
0 files changed, 0 insertions, 0 deletions