diff options
| author | Rickard Green <[email protected]> | 2015-07-08 22:41:12 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-07-08 22:41:12 +0200 |
| commit | 297464bd83bd8be34d553eecb235d6a398e42dbb (patch) | |
| tree | fd6359998b4004feacff3265c650513f92a05412 /erts/etc/ose/run_erl_main.c | |
| parent | e16d2a78e6e60dcc57867748ae809e448ef578e4 (diff) | |
| parent | 859428cc405e3000c625a6c44a80bd3b22ad113d (diff) | |
| download | otp-297464bd83bd8be34d553eecb235d6a398e42dbb.tar.gz otp-297464bd83bd8be34d553eecb235d6a398e42dbb.tar.bz2 otp-297464bd83bd8be34d553eecb235d6a398e42dbb.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Fix calculation of end time
Prefer monotonic time that stop during suspend
Avoid unnecessary copying of data when retrieving corrected monotonic time
Add the --enable-gettimeofday-as-os-system-time configure switch
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'erts/etc/ose/run_erl_main.c')
0 files changed, 0 insertions, 0 deletions