diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-07-26 10:28:59 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-07-26 10:28:59 +0200 |
| commit | 915628f0545a86033a7e07f9937d0e3d92c16907 (patch) | |
| tree | c8913649db24ea7aed9d7525d91631a903d563a9 /erts/emulator/beam/erl_hl_timer.h | |
| parent | 825145898d7bf69147c1e6a6ad66c3454e7ec8f1 (diff) | |
| parent | 84549af1c996657aedee1263afec28b21bfa42a4 (diff) | |
| download | otp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.gz otp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.bz2 otp-915628f0545a86033a7e07f9937d0e3d92c16907.zip | |
Merge branch 'lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770' into maint
* lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770:
Respect -proto_dist switch while connection to EPMD
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.h')
0 files changed, 0 insertions, 0 deletions