aboutsummaryrefslogtreecommitdiffstats
path: root/lib/et
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2014-07-09 11:52:33 +0200
committerBruce Yinhe <[email protected]>2014-07-09 11:52:33 +0200
commitb56aac7450542b29b54e201195a7104f19bbdfd6 (patch)
treec778266dab607d0b66c133fb7e56ffc7216c29db /lib/et
parent2c7c3230ad2f759592308d5a5210c60bc39b3dd6 (diff)
parent61fefeb9d96b4899efbc945138b23b73cb9b6ac9 (diff)
downloadotp-b56aac7450542b29b54e201195a7104f19bbdfd6.tar.gz
otp-b56aac7450542b29b54e201195a7104f19bbdfd6.tar.bz2
otp-b56aac7450542b29b54e201195a7104f19bbdfd6.zip
Merge branch 'legoscia/patch-7' into maint
OTP-12052 * legoscia/patch-7: erlang:statistics(runtime) returns milliseconds
Diffstat (limited to 'lib/et')
0 files changed, 0 insertions, 0 deletions