aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-06-13 18:57:11 +0200
committerErlang/OTP <[email protected]>2012-06-13 18:57:11 +0200
commit3d0199a8a9d604aa7a22e996adfd249dddbdccf8 (patch)
tree6d258ac2f0d96d7f9f5f3ecf6e5b5ef5115e6ee9 /erts/vsn.mk
parentb16baad540d35b890c0c6baf9a1be2a90ea96239 (diff)
parent70b17a5ccb8204df1fbbf04d8232492267dd7533 (diff)
downloadotp-3d0199a8a9d604aa7a22e996adfd249dddbdccf8.tar.gz
otp-3d0199a8a9d604aa7a22e996adfd249dddbdccf8.tar.bz2
otp-3d0199a8a9d604aa7a22e996adfd249dddbdccf8.zip
Merge branch 'pan/heart_and_times/OTP-10111' into maint-r13
* pan/heart_and_times/OTP-10111: Make heart use clock_gettime when available
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions