aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_hl_timer.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-09-06 12:16:20 +0200
committerRickard Green <[email protected]>2016-09-06 12:16:20 +0200
commit02c9a648db3753008e67f22140a2bf8dd8912ccd (patch)
tree9bdd44eca190e1d186e77033f38c56c25cd8ce55 /erts/emulator/beam/erl_hl_timer.c
parentdd2919dc29d3eb0d287522c7485bf42343173937 (diff)
parent1c969304d4df4ad22c0089100a071bcb1dca4275 (diff)
downloadotp-02c9a648db3753008e67f22140a2bf8dd8912ccd.tar.gz
otp-02c9a648db3753008e67f22140a2bf8dd8912ccd.tar.bz2
otp-02c9a648db3753008e67f22140a2bf8dd8912ccd.zip
Merge branch 'rickard/drv-send-term-thr-bug/OTP-13866' into maint
* rickard/drv-send-term-thr-bug/OTP-13866: Fix thread calls to erl_drv_send_term()/erl_drv_output_term() Conflicts: erts/emulator/beam/io.c
Diffstat (limited to 'erts/emulator/beam/erl_hl_timer.c')
0 files changed, 0 insertions, 0 deletions