aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-08-20 15:39:46 +0200
committerPatrik Nyblom <[email protected]>2012-08-20 15:39:46 +0200
commitcca575e1da4736d4e57a1bcafc492415d60b8c23 (patch)
tree08f0b53619438a26a72be8f278db5044dc7b5d8b /erts/include
parentf11a10e75d7f3b49a58ac225d624ac6654e23870 (diff)
parent70b17a5ccb8204df1fbbf04d8232492267dd7533 (diff)
downloadotp-cca575e1da4736d4e57a1bcafc492415d60b8c23.tar.gz
otp-cca575e1da4736d4e57a1bcafc492415d60b8c23.tar.bz2
otp-cca575e1da4736d4e57a1bcafc492415d60b8c23.zip
Merge branch 'pan/heart_and_times/OTP-10111' into maint
* pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions