diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-06-28 15:11:16 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2010-06-28 15:11:16 +0200 |
| commit | 249613f10368dc694edb0a962d6025e19940b5af (patch) | |
| tree | c8f0dda9932674d8d26c0e74d3029d6ec8d3eb6b | |
| parent | c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a (diff) | |
| parent | 1e3f5852ca0689e68c540d2c52e28f4fa84ad52b (diff) | |
| download | otp-249613f10368dc694edb0a962d6025e19940b5af.tar.gz otp-249613f10368dc694edb0a962d6025e19940b5af.tar.bz2 otp-249613f10368dc694edb0a962d6025e19940b5af.zip | |
Merge branch 'egil/update-system-vsn' into dev
| -rw-r--r-- | erts/vsn.mk | 4 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/stdlib/vsn.mk | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 6e1338cff5..ce6330e6dd 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -17,8 +17,8 @@ # %CopyrightEnd% # -VSN = 5.8 -SYSTEM_VSN = R14A +VSN = 5.8.1 +SYSTEM_VSN = R14B # Port number 4365 in 4.2 # Port number 4366 in 4.3 diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 7dd99b37dd..9a191f9aeb 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -17,4 +17,4 @@ # %CopyrightEnd% # -KERNEL_VSN = 2.14 +KERNEL_VSN = 2.14.1 diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk index f081bd60e2..02ea6d9d68 100644 --- a/lib/stdlib/vsn.mk +++ b/lib/stdlib/vsn.mk @@ -17,5 +17,4 @@ # %CopyrightEnd% # -STDLIB_VSN = 1.17 - +STDLIB_VSN = 1.17.1 |