aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-08-24 15:53:16 +0200
committerRickard Green <[email protected]>2017-08-24 15:53:16 +0200
commitb93cc1dc4dadd109ef841b360d7baf99688ce918 (patch)
tree78076d0a3a2fd3a86d1b8d011b9505bd035cd5dc /.gitignore
parent9762af0851da245444173b22509462b90c7cc7c6 (diff)
parent076167bae6cc57d188cdf59fd94c82f3a36ee7ee (diff)
downloadotp-b93cc1dc4dadd109ef841b360d7baf99688ce918.tar.gz
otp-b93cc1dc4dadd109ef841b360d7baf99688ce918.tar.bz2
otp-b93cc1dc4dadd109ef841b360d7baf99688ce918.zip
Merge branch 'rickard/timer-sid-bug/OTP-14548' into maint
* rickard/timer-sid-bug/OTP-14548: Fix scheduler id field in timers Conflicts: erts/emulator/beam/erl_hl_timer.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions