diff options
author | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
---|---|---|
committer | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
commit | 9a1419a7d4325085dc2235a8531d77e1d96ea689 (patch) | |
tree | ebb7ed16ce92c1c99b44091bee9e4d2a7220ef75 /erts/vsn.mk | |
parent | a56f6e3e716c4a2c8f16933e1e30759381c4fdb8 (diff) | |
parent | 934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff) | |
download | otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.gz otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.bz2 otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.zip |
Merge branch 'maint-17' into maint
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 96edae99d9..0db4370ea8 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,7 +17,7 @@ # %CopyrightEnd% # -VSN = 6.1.1 +VSN = 6.1.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |