aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/beam_emu.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-09-05 14:40:33 +0200
committerRickard Green <[email protected]>2017-09-05 14:40:33 +0200
commit67f6114d3701dd38614acf520f13c07174a99d11 (patch)
treef0fa9d412359ba9ee3b8be2c098fc49bc72fc8f3 /erts/emulator/beam/beam_emu.c
parent60c836afbb7c993f3bd635e12c80f018aa017e3b (diff)
parent5a45d2917cd14bf5eab690453e8a191549de4c2c (diff)
downloadotp-67f6114d3701dd38614acf520f13c07174a99d11.tar.gz
otp-67f6114d3701dd38614acf520f13c07174a99d11.tar.bz2
otp-67f6114d3701dd38614acf520f13c07174a99d11.zip
Merge branch 'rickard/statistics-time-fixes/OTP-14597/ERL-465' into maint
* rickard/statistics-time-fixes/OTP-14597/ERL-465: Bug fixes of statistics(wall_clock) and statistics(runtime) Conflicts: erts/emulator/beam/erl_time_sup.c
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
0 files changed, 0 insertions, 0 deletions