diff options
| author | Rickard Green <[email protected]> | 2016-08-12 14:07:05 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-12 14:07:05 +0200 |
| commit | 3e30322d21066ccbd522a7328b455f57d62b94d0 (patch) | |
| tree | b80c6cdd208ef06d229d34991221e466cc72be02 /erts/vsn.mk | |
| parent | 240846e5dc852eb6af7e2047d1dd757960780244 (diff) | |
| parent | 49722eb3e32b92563e576283d84531797c2a3627 (diff) | |
| download | otp-3e30322d21066ccbd522a7328b455f57d62b94d0.tar.gz otp-3e30322d21066ccbd522a7328b455f57d62b94d0.tar.bz2 otp-3e30322d21066ccbd522a7328b455f57d62b94d0.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Avoid segfault when printing slogan after crashdumping
Fix race causing lost wakeup on receive-after timeout
Conflicts:
OTP_VERSION
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 dff6b615fc..acd4509304 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.0.2 +VSN = 8.0.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |