diff options
author | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
commit | f45b817d0da8f9f61d2241d4f0eb06e47a6be86a (patch) | |
tree | 55648184781e4aecb43f7489b7bc7f82c55c1d2c /erts/emulator/sys/common | |
parent | 1a1eaec544987f439061622f0177e424dfd6306a (diff) | |
parent | 876af25b600bf698cac95cd1902fa16aeecc0c7e (diff) | |
download | otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.gz otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.bz2 otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.zip |
Merge branch 'maint'
* maint:
Use nano second time unit in tracing
Diffstat (limited to 'erts/emulator/sys/common')
0 files changed, 0 insertions, 0 deletions