diff options
| author | Rickard Green <[email protected]> | 2016-11-25 15:23:36 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-11-25 15:23:36 +0100 |
| commit | f8aef2dcae7162b59efb9513442c9643c9f5159e (patch) | |
| tree | ab9bd428a532f400923cacc32a7f87ccc9bb70a2 /erts/include | |
| parent | 9e0d9398d51afc7fc6fafbcbd0a6a8bdeeb3802f (diff) | |
| parent | ca7578aca806a6eb3e816c918120db78f485f5cb (diff) | |
| download | otp-f8aef2dcae7162b59efb9513442c9643c9f5159e.tar.gz otp-f8aef2dcae7162b59efb9513442c9643c9f5159e.tar.bz2 otp-f8aef2dcae7162b59efb9513442c9643c9f5159e.zip | |
Merge branch 'rickard/init-bug/OTP-13911' into maint
* rickard/init-bug/OTP-13911:
Fix initialization dependencies between time, lock-check and lcnt
Conflicts:
erts/emulator/sys/unix/sys.c
Diffstat (limited to 'erts/include')
0 files changed, 0 insertions, 0 deletions