aboutsummaryrefslogtreecommitdiffstats
path: root/erts/prebuild.skip
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-07-08 20:31:19 +0200
committerErlang/OTP <[email protected]>2015-07-08 20:31:19 +0200
commita527a19e03c9c05e578cf998434c67c6cce86e6f (patch)
tree6379360132c1923bfeb657dd5177004145327126 /erts/prebuild.skip
parent385b215c420b1a3b98f02a67c562f2ed0512f17a (diff)
parenta782ed0ca14952dd83560ad7c5a43888bef19cdb (diff)
downloadotp-a527a19e03c9c05e578cf998434c67c6cce86e6f.tar.gz
otp-a527a19e03c9c05e578cf998434c67c6cce86e6f.tar.bz2
otp-a527a19e03c9c05e578cf998434c67c6cce86e6f.zip
Merge branch 'rickard/end-time-fix/OTP-12896' into maint-18
* rickard/end-time-fix/OTP-12896: Fix calculation of end time
Diffstat (limited to 'erts/prebuild.skip')
0 files changed, 0 insertions, 0 deletions