diff options
| author | Erlang/OTP <[email protected]> | 2012-06-14 15:11:48 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-06-14 15:11:48 +0200 |
| commit | 6fd5ecd1cb35cec9222be5227994bb386c74fa04 (patch) | |
| tree | 23e73601f3e49c62eee5a5a41a6eb06cfec500ba /erts/emulator | |
| parent | aff21f5dffc035dd97215ec1a2c281b84412f29f (diff) | |
| parent | ad660455d333d2538473f5b7abf7ab1784027da0 (diff) | |
| download | otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.tar.gz otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.tar.bz2 otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.zip | |
Merge branch 'pan/heart_and_times/r14/OTP-10111' into maint-r14
* pan/heart_and_times/r14/OTP-10111:
Bump vsn
Teach heart to use clock_gettime instead of times()
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions