aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-08 15:04:28 +0200
committerMarcus Arendt <[email protected]>2014-08-08 15:04:28 +0200
commit05c8a2f9ba5c93985fb64a63f19ed4de22560829 (patch)
tree89253eecdf161489dd68ee35ae584c99ab373443 /erts
parent07b86000da9f50be61fe3fa04ac530c0cf8930d9 (diff)
parente189bae81fbc873d3349b9dec12ef234daf9d8ad (diff)
downloadotp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.gz
otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.bz2
otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions