diff options
| author | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
| commit | 29ed0766068fbf960651c3f4d1f73281304dd546 (patch) | |
| tree | 70c9f75ba131f21c3fda6d3684eee070bc027668 /erts/emulator/test/nif_SUITE.erl | |
| parent | 26eba549b2adc29bab37a5edd7aa96b42399936e (diff) | |
| parent | 2e016f6cde89bf471269c89f0fd2bb40422ce204 (diff) | |
| download | otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.gz otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.bz2 otp-29ed0766068fbf960651c3f4d1f73281304dd546.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Misc fixes
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/test/nif_SUITE.erl')
0 files changed, 0 insertions, 0 deletions