aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-10-14 10:15:13 +0200
committerHans Nilsson <[email protected]>2016-10-14 10:15:13 +0200
commit9eee0bb5cc74d037ce89521b9a1fec4a289e4880 (patch)
tree7f41e1612c113f8beb50d3e8b2e26155dd00a3d7 /erts
parent3d925002ceed8f0a739e17e65643a20f6c3f1142 (diff)
parentdf8c6690a86d087d8de324276b2266bc5918c779 (diff)
downloadotp-9eee0bb5cc74d037ce89521b9a1fec4a289e4880.tar.gz
otp-9eee0bb5cc74d037ce89521b9a1fec4a289e4880.tar.bz2
otp-9eee0bb5cc74d037ce89521b9a1fec4a289e4880.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions