aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-10-12 16:44:43 +0200
committerZandra <[email protected]>2015-10-12 16:44:43 +0200
commit1ee7a4e26e66aac66ee5a17c752e0a518c07ad10 (patch)
treec8b93fc5f53fd6192481425b3067a62f17b89ef0 /erts/emulator
parent6326eb0c87c97ac463220cdc5138c3694e5ef7ec (diff)
parent8266a6056ff3b4292d98485665e5444addd689b6 (diff)
downloadotp-1ee7a4e26e66aac66ee5a17c752e0a518c07ad10.tar.gz
otp-1ee7a4e26e66aac66ee5a17c752e0a518c07ad10.tar.bz2
otp-1ee7a4e26e66aac66ee5a17c752e0a518c07ad10.zip
Merge branch 'stolen/unified_dist' into maint
OTP-13040 * stolen/unified_dist: kernel: inet6_tcp_dist: reuse inet_tcp_dist code Conflicts: lib/kernel/src/inet_tcp_dist.erl
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions