diff options
| author | Lukas Larsson <[email protected]> | 2016-07-11 10:12:09 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-07-11 10:12:09 +0200 |
| commit | a5256e5221aff30f6d2cc7fab4875914ae734217 (patch) | |
| tree | 7c003461db2bf0954f03f2c97399cb553210332d /erts/emulator/utils | |
| parent | 26a82340090afa7b79db3e0e54f6f8dace290f91 (diff) | |
| parent | 3b186417f6641a3aa13a46e00712d7dfcb29fc0f (diff) | |
| download | otp-a5256e5221aff30f6d2cc7fab4875914ae734217.tar.gz otp-a5256e5221aff30f6d2cc7fab4875914ae734217.tar.bz2 otp-a5256e5221aff30f6d2cc7fab4875914ae734217.zip | |
Merge branch 'lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734' into maint
* lukas/erts/tracing/bif_return_to_trace_fix/OTP-13734:
erts: After a call to a tracer nif, reset htop
erts: Check if return_to trace is enabled for bif
Diffstat (limited to 'erts/emulator/utils')
0 files changed, 0 insertions, 0 deletions