diff options
| author | Rickard Green <[email protected]> | 2018-08-30 13:17:42 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-30 13:17:42 +0200 |
| commit | 392bbf34425fba0c740592a81a503b9d76983460 (patch) | |
| tree | 1cbdc22473917716424892567f3045eaff17f2ba /erts/vsn.mk | |
| parent | f2fac67bc61407017acc3d8db3b36c3e08804394 (diff) | |
| parent | f7012b7a731924193cf05fc77b103e89bd0fcbfb (diff) | |
| download | otp-392bbf34425fba0c740592a81a503b9d76983460.tar.gz otp-392bbf34425fba0c740592a81a503b9d76983460.tar.bz2 otp-392bbf34425fba0c740592a81a503b9d76983460.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Update release notes
Update version numbers
Fix missing 'in' trace events during 'running' trace
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 c0444fa483..feb51e42d2 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.0.5 +VSN = 10.0.6 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |