diff options
| author | Siri Hansen <[email protected]> | 2019-03-04 12:02:26 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-03-04 12:02:26 +0100 |
| commit | 6d795779f770deb1829e1df2fa4a75f41e602d35 (patch) | |
| tree | e94d7ca27da1b9e5a6fb10e28927518097e57664 /erts/preloaded/ebin/erl_prim_loader.beam | |
| parent | df25e742f1ab87f8dbb290eed8e24ec919c3780a (diff) | |
| parent | 615d36fab80acb1638f904b16a2f6cec93ce07a6 (diff) | |
| download | otp-6d795779f770deb1829e1df2fa4a75f41e602d35.tar.gz otp-6d795779f770deb1829e1df2fa4a75f41e602d35.tar.bz2 otp-6d795779f770deb1829e1df2fa4a75f41e602d35.zip | |
Merge branch 'siri/logger/os-timestamp/OTP-15625' into maint
* siri/logger/os-timestamp/OTP-15625:
Update preloaded
[logger] Change timestamp from erlang:system_time to os:system_time
Diffstat (limited to 'erts/preloaded/ebin/erl_prim_loader.beam')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 54496 -> 54576 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex 7cb34c2d58..6f5a75a2db 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam |