aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-13 10:44:19 +0100
committerZandra <[email protected]>2015-11-13 10:44:19 +0100
commit263d1e6bb37cb09f0d09039da625f14db656f552 (patch)
tree24c31a5c668335cae79e59962ad0c75f329d0230 /erts
parente8f6435d3c932a03101c12a1263d355112e399bf (diff)
parent0db6272323fd662cb43f5bb4d24f01daa8a6647d (diff)
downloadotp-263d1e6bb37cb09f0d09039da625f14db656f552.tar.gz
otp-263d1e6bb37cb09f0d09039da625f14db656f552.tar.bz2
otp-263d1e6bb37cb09f0d09039da625f14db656f552.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions