aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra <[email protected]>2016-01-29 17:44:07 +0100
committerZandra <[email protected]>2016-01-29 17:44:07 +0100
commite038cbe699acc19901e10b9569a3b783e900582d (patch)
treeb1167aedbaebb835e0a8a59be8528f43b4da3864 /erts
parent8a6abf9ac1ce0bae427e202b857d03b89086bb8d (diff)
parent57a928b4bc1076b169ecc95e38ab23cf79e03280 (diff)
downloadotp-e038cbe699acc19901e10b9569a3b783e900582d.tar.gz
otp-e038cbe699acc19901e10b9569a3b783e900582d.tar.bz2
otp-e038cbe699acc19901e10b9569a3b783e900582d.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions