aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-22 09:46:16 +0200
committerMarcus Arendt <[email protected]>2014-08-22 09:46:16 +0200
commit3d74589f0519da8c81f1cb4bff6c01a0011a1063 (patch)
treea271e272fa85659a0ffdb2364922bca991cd9507 /erts
parented5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9 (diff)
parentf20fa6b33b4006ea61e43db0386f6ad5a46d2239 (diff)
downloadotp-3d74589f0519da8c81f1cb4bff6c01a0011a1063.tar.gz
otp-3d74589f0519da8c81f1cb4bff6c01a0011a1063.tar.bz2
otp-3d74589f0519da8c81f1cb4bff6c01a0011a1063.zip
Merge branch 'marcus/OTP-17.2.1/mergefix' into maint
* marcus/OTP-17.2.1/mergefix: Updated OTP version Update release notes
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions