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 /erts/vsn.mk | |
| 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 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 985834a801..478f581f13 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 7.0.1 +VSN = 7.0.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |