diff options
| author | Rickard Green <[email protected]> | 2015-07-08 22:36:43 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-07-08 22:36:43 +0200 |
| commit | 859428cc405e3000c625a6c44a80bd3b22ad113d (patch) | |
| tree | 9eb2d727884874fe241345cce142669fa9fe9ff2 /OTP_VERSION | |
| parent | 3461837363d82e6c908ac81f664da4372aa3a8b0 (diff) | |
| parent | 61828f77ca2542109ece006d730a4f8fe3300616 (diff) | |
| download | otp-859428cc405e3000c625a6c44a80bd3b22ad113d.tar.gz otp-859428cc405e3000c625a6c44a80bd3b22ad113d.tar.bz2 otp-859428cc405e3000c625a6c44a80bd3b22ad113d.zip | |
Merge branch 'maint-18' into maint
* maint-18:
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
Diffstat (limited to 'OTP_VERSION')
| -rw-r--r-- | OTP_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index 9ce7d613e2..3d5ab6e54d 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -18.0.1 +18.0.2 |