diff options
| author | Erlang/OTP <[email protected]> | 2015-07-08 20:31:18 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-07-08 20:31:18 +0200 |
| commit | 385b215c420b1a3b98f02a67c562f2ed0512f17a (patch) | |
| tree | 98ca35f000f2fd8bbbd2caaa8f4fe07e699a81c7 /make/emd2exml.in | |
| parent | 86a121c5e59ab891b51ba8f28b705659d84e7330 (diff) | |
| parent | 4a864c1cbe16a42f3f5190881187e3c9849e985f (diff) | |
| download | otp-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 'make/emd2exml.in')
0 files changed, 0 insertions, 0 deletions