diff options
author | Erlang/OTP <[email protected]> | 2015-07-08 20:31:19 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-07-08 20:31:19 +0200 |
commit | a527a19e03c9c05e578cf998434c67c6cce86e6f (patch) | |
tree | 6379360132c1923bfeb657dd5177004145327126 /erts/emulator/sys | |
parent | 385b215c420b1a3b98f02a67c562f2ed0512f17a (diff) | |
parent | a782ed0ca14952dd83560ad7c5a43888bef19cdb (diff) | |
download | otp-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/emulator/sys')
0 files changed, 0 insertions, 0 deletions