diff options
| author | Erlang/OTP <[email protected]> | 2012-08-16 19:03:04 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-08-16 19:03:04 +0200 |
| commit | 6c55f07d84c7458286fe4f1f830976bfd4a0df11 (patch) | |
| tree | 7c4778a13caabfa3790f0071df4c11bb913ef262 /otp_build | |
| parent | 6cb6829ae3e7d06e2f24d50ff80a60ac1aa1e72c (diff) | |
| parent | 745e246212e9d361554f6a3769af0c42898118eb (diff) | |
| download | otp-6c55f07d84c7458286fe4f1f830976bfd4a0df11.tar.gz otp-6c55f07d84c7458286fe4f1f830976bfd4a0df11.tar.bz2 otp-6c55f07d84c7458286fe4f1f830976bfd4a0df11.zip | |
Merge branch 'pan/heart_and_times/r15/OTP-10111' into maint-r15
* pan/heart_and_times/r15/OTP-10111:
Bump vsn
Teach heart to use clock_gettime instead of times()
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions