aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-27 14:57:57 +0200
committerFredrik Gustafsson <[email protected]>2012-08-27 14:57:57 +0200
commitc6fc61ffab426cc7b391eb903e7942bda809a230 (patch)
tree27ae3dcefdd676c115c7fb77ac1d87b6891a7c76 /erts/etc
parent5d2e66f48c9be7e67e38977d8f88f737f60dfc54 (diff)
parent904384397517ded1e9d2e3b1c6fdf16eeb2dab67 (diff)
downloadotp-c6fc61ffab426cc7b391eb903e7942bda809a230.tar.gz
otp-c6fc61ffab426cc7b391eb903e7942bda809a230.tar.bz2
otp-c6fc61ffab426cc7b391eb903e7942bda809a230.zip
Merge branch 'psi/fix-leap-seconds/OTP-10227' into maint
Diffstat (limited to 'erts/etc')
0 files changed, 0 insertions, 0 deletions