diff options
| author | John Högberg <[email protected]> | 2018-11-16 12:34:48 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-11-16 12:34:48 +0100 |
| commit | d7f9029afb669fd8dd8590e72cd7f0f30b2e9c84 (patch) | |
| tree | 9ca95dd422574a24b3691cc798bc3d9a125fe01a /erts/vsn.mk | |
| parent | 605117974bee105094fa6bd9e4b7b47ae623eb1a (diff) | |
| parent | 5503d96504a89b1b00a78f7e7d12e79be553b215 (diff) | |
| download | otp-d7f9029afb669fd8dd8590e72cd7f0f30b2e9c84.tar.gz otp-d7f9029afb669fd8dd8590e72cd7f0f30b2e9c84.tar.bz2 otp-d7f9029afb669fd8dd8590e72cd7f0f30b2e9c84.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
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 01c19aff2f..241d5a3b85 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.1.1 +VSN = 10.1.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |