diff options
| author | Lukas Larsson <[email protected]> | 2016-07-11 10:12:31 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-07-11 10:12:31 +0200 |
| commit | 8ae4ab7c4839a19b1b2e8fc28087c0471d8dbd87 (patch) | |
| tree | d9a2d7bdda748068ba75ab93b4c6608c16e12899 /erts/emulator/beam/erl_lock_check.c | |
| parent | 8c1da8dc9f3c5d28fecbd46295cab62d58c2cb26 (diff) | |
| parent | a5256e5221aff30f6d2cc7fab4875914ae734217 (diff) | |
| download | otp-8ae4ab7c4839a19b1b2e8fc28087c0471d8dbd87.tar.gz otp-8ae4ab7c4839a19b1b2e8fc28087c0471d8dbd87.tar.bz2 otp-8ae4ab7c4839a19b1b2e8fc28087c0471d8dbd87.zip | |
Merge branch 'maint'
* maint:
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/beam/erl_lock_check.c')
0 files changed, 0 insertions, 0 deletions