aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-14 12:42:50 +0200
committerHenrik Nord <[email protected]>2015-10-14 12:42:50 +0200
commitf92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2 (patch)
tree0eaaf1c3424cb924d7eb30558089ede1e3730872 /erts
parent11229947bed829ee0691d9669a4858fd8cf6cbb7 (diff)
parent930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (diff)
downloadotp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.gz
otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.bz2
otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions