diff options
| author | Rickard Green <[email protected]> | 2016-02-02 10:33:34 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-02 10:33:34 +0100 |
| commit | 31911a7d87c0de0cde4ce166c9ad35be08597e2f (patch) | |
| tree | dcf92fe86eb71e7c1042c07bda9927c9db4b9d1d /lib/inets/vsn.mk | |
| parent | f269d952033a177836fa5e949857035c6b6f9c6b (diff) | |
| parent | 178cff0a09223da707ca8472a71dbe4125466493 (diff) | |
| download | otp-31911a7d87c0de0cde4ce166c9ad35be08597e2f.tar.gz otp-31911a7d87c0de0cde4ce166c9ad35be08597e2f.tar.bz2 otp-31911a7d87c0de0cde4ce166c9ad35be08597e2f.zip | |
Merge branch 'maint'
* maint:
Introduce time management in native APIs
Introduce time warp safe replacement for safe_fixed option
Introduce time warp safe trace timestamp formats
Conflicts:
erts/emulator/beam/erl_bif_trace.c
erts/emulator/beam/erl_driver.h
erts/emulator/beam/erl_nif.h
erts/emulator/beam/erl_trace.c
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'lib/inets/vsn.mk')
0 files changed, 0 insertions, 0 deletions