diff options
| author | Erlang/OTP <[email protected]> | 2012-06-14 15:11:48 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-06-14 15:11:48 +0200 |
| commit | 6fd5ecd1cb35cec9222be5227994bb386c74fa04 (patch) | |
| tree | 23e73601f3e49c62eee5a5a41a6eb06cfec500ba /erts/vsn.mk | |
| parent | aff21f5dffc035dd97215ec1a2c281b84412f29f (diff) | |
| parent | ad660455d333d2538473f5b7abf7ab1784027da0 (diff) | |
| download | otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.tar.gz otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.tar.bz2 otp-6fd5ecd1cb35cec9222be5227994bb386c74fa04.zip | |
Merge branch 'pan/heart_and_times/r14/OTP-10111' into maint-r14
* pan/heart_and_times/r14/OTP-10111:
Bump vsn
Teach heart to use clock_gettime instead of times()
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 224727b094..0e755ad8c5 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,7 +17,7 @@ # %CopyrightEnd% # -VSN = 5.8.5.1 +VSN = 5.8.5.2 SYSTEM_VSN = R14B04 # Port number 4365 in 4.2 |