aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-05-12 10:39:07 +0200
committerHans Nilsson <[email protected]>2017-05-12 10:39:07 +0200
commit773c4d4f0416f25e3c0c6939f8d0871dc4486bab (patch)
tree942a4a892eee6faad4074b21f69aa852d59f8b23 /erts/emulator
parent9fcbf829e38f4e63bc238d56d4debe38fde7b051 (diff)
parent736de00985c1ed44760e52283eeb727d3f14bb1f (diff)
downloadotp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.gz
otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.tar.bz2
otp-773c4d4f0416f25e3c0c6939f8d0871dc4486bab.zip
Merge branch 'maint'
Conflicts: OTP_VERSION lib/inets/vsn.mk lib/ssl/vsn.mk
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions