diff options
author | Lukas Larsson <[email protected]> | 2014-06-05 11:04:57 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2014-06-05 11:04:57 +0200 |
commit | 5eb7105fb6f479ed50db5435d510aae0306b8d46 (patch) | |
tree | 2420afdc8535e091a9aec80ed5d201634e7356b8 /erts/Makefile.in | |
parent | dd764d2a8070111f026aef0d21be1e2a19ad988f (diff) | |
parent | e492b43c3e4366e865e5f1c34d0834df2a91d490 (diff) | |
download | otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.gz otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.bz2 otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.zip |
Merge branch 'etsukata/system_info_tolerant_timeofday/OTP-11970' into maint
* etsukata/system_info_tolerant_timeofday/OTP-11970:
Add erlang:system_info(tolerant_timeofday)
Diffstat (limited to 'erts/Makefile.in')
0 files changed, 0 insertions, 0 deletions