diff options
| author | Rickard Green <[email protected]> | 2019-03-06 17:03:54 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-06 17:03:54 +0100 |
| commit | 328e988b471babd305a15cd0b7ff7a8755c4420b (patch) | |
| tree | c0bb3dbf0d5e69170dad6306bb110f9e118cef41 /erts/vsn.mk | |
| parent | 50a2582b39507149452d298129616a7d5feafbf2 (diff) | |
| parent | 933e1671a99958540666781082188f7335fb2823 (diff) | |
| download | otp-328e988b471babd305a15cd0b7ff7a8755c4420b.tar.gz otp-328e988b471babd305a15cd0b7ff7a8755c4420b.tar.bz2 otp-328e988b471babd305a15cd0b7ff7a8755c4420b.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 e4bdb1a8eb..bab5c805eb 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.2.4 +VSN = 10.2.5 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |