aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-07-08 20:31:18 +0200
committerErlang/OTP <[email protected]>2015-07-08 20:31:18 +0200
commit385b215c420b1a3b98f02a67c562f2ed0512f17a (patch)
tree98ca35f000f2fd8bbbd2caaa8f4fe07e699a81c7 /erts/emulator/beam
parent86a121c5e59ab891b51ba8f28b705659d84e7330 (diff)
parent4a864c1cbe16a42f3f5190881187e3c9849e985f (diff)
downloadotp-385b215c420b1a3b98f02a67c562f2ed0512f17a.tar.gz
otp-385b215c420b1a3b98f02a67c562f2ed0512f17a.tar.bz2
otp-385b215c420b1a3b98f02a67c562f2ed0512f17a.zip
Merge branch 'rickard/monotonic-clock-source/OTP-12895' into maint-18
* rickard/monotonic-clock-source/OTP-12895: Prefer monotonic time that stop during suspend
Diffstat (limited to 'erts/emulator/beam')
0 files changed, 0 insertions, 0 deletions