diff options
| author | Micael Karlberg <[email protected]> | 2011-10-25 12:37:39 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-10-25 12:37:39 +0200 |
| commit | 07c75e55e80b81960de6f5b0deecd5eb94712efb (patch) | |
| tree | 70ce5bd58e6a5feb41d528efb25d711648218fb8 /erts/vsn.mk | |
| parent | f9060599aeab81cb9282ddf51cc057bf1353208f (diff) | |
| parent | f8b20b4a995727f0339074d23a0fae50712683d2 (diff) | |
| download | otp-07c75e55e80b81960de6f5b0deecd5eb94712efb.tar.gz otp-07c75e55e80b81960de6f5b0deecd5eb94712efb.tar.bz2 otp-07c75e55e80b81960de6f5b0deecd5eb94712efb.zip | |
Merge branch 'maint-r13' of super:otp into bmk/inets/httpd/xss_when_erl_encoded/OTP-9655
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 14c6a3e4dd..4e6571c70b 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,7 +17,7 @@ # %CopyrightEnd% # -VSN = 5.7.5.1 +VSN = 5.7.5.2 SYSTEM_VSN = R13B04 # Port number 4365 in 4.2 |