aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-03-16 11:17:14 +0100
committerHans Nilsson <[email protected]>2015-03-16 11:17:14 +0100
commitf4c126c90e60385dc91dbf16d4cc1a81036bda76 (patch)
treefd754302a93b8617c5c2289c7348e30216a86e7e /erts
parentc1d5655e1f8a5849c01bcd35d3fbacc1d5c88776 (diff)
parent5319d8df72ff036bd8350cd6f00d34bd3c0d0d4e (diff)
downloadotp-f4c126c90e60385dc91dbf16d4cc1a81036bda76.tar.gz
otp-f4c126c90e60385dc91dbf16d4cc1a81036bda76.tar.bz2
otp-f4c126c90e60385dc91dbf16d4cc1a81036bda76.zip
Merge branch 'hans/version_updates' into maint
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions