aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-04-10 14:51:04 +0200
committerZandra Hird <[email protected]>2015-04-10 14:51:04 +0200
commitb5f3973cc50a193be868e672b2ced6dd619427c4 (patch)
treebfe20ffc467ef3c535fd5580f89cc4c1ab8ca818 /erts/doc
parent5c2c2f537e66f1637eb51b364cb962a69a7b0faf (diff)
parentbbac1019905e6e493a2cd3c8463e53a818d0723d (diff)
downloadotp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.gz
otp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.bz2
otp-b5f3973cc50a193be868e672b2ced6dd619427c4.zip
Merge branch 'maint-17'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts/doc')
0 files changed, 0 insertions, 0 deletions