diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 10:22:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 10:22:56 +0100 |
| commit | 588a0d9c86b1b85a2cd7635460564ddaac566882 (patch) | |
| tree | 6f86ef92bdea8a01310cb89703beb1e69c9280bd /erts/vsn.mk | |
| parent | 91b2e57ea0e3ab794d4b57a12ef10205383525a5 (diff) | |
| parent | f10de199e5aad1aecbff03a5e7af9e1c5d017301 (diff) | |
| download | otp-588a0d9c86b1b85a2cd7635460564ddaac566882.tar.gz otp-588a0d9c86b1b85a2cd7635460564ddaac566882.tar.bz2 otp-588a0d9c86b1b85a2cd7635460564ddaac566882.zip | |
Merge branch 'bmk/inets/httpc/support_upload_body_streaming/OTP-9094' into bmk/inets/inet56_integration
Diffstat (limited to 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 8a1590e74c..193a914a70 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2010. All Rights Reserved. +# Copyright Ericsson AB 1997-2011. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -17,8 +17,8 @@ # %CopyrightEnd% # -VSN = 5.8.3 -SYSTEM_VSN = R14B02 +VSN = 5.8.4 +SYSTEM_VSN = R14B03 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |