aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-26 11:57:14 +0100
committerZandra <[email protected]>2015-11-26 11:57:14 +0100
commit7cff7b6f315cce44c4f4eae6b6bf30e255314fd6 (patch)
treec19022525dbfb8447ed32643990d8831baced665 /otp_build
parent3747f01d19676f6f8d5d8b0a05c9ddbf6d92be49 (diff)
parent120975c4fcb57ecd14031ac046f483e56a3daa4d (diff)
downloadotp-7cff7b6f315cce44c4f4eae6b6bf30e255314fd6.tar.gz
otp-7cff7b6f315cce44c4f4eae6b6bf30e255314fd6.tar.bz2
otp-7cff7b6f315cce44c4f4eae6b6bf30e255314fd6.zip
Merge branch 'ppikula/fix-24h-macro' into maint
* ppikula/fix-24h-macro: fix incorrect number of seconds in 24h macro The previous commit - 7b93f5d8a224a0a076a420294c95a666a763ee60 fixed the macro only in one place. OTP-13141
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions