diff options
| author | Raimo Niskanen <[email protected]> | 2019-07-12 11:43:54 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-07-12 11:43:54 +0200 |
| commit | 7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff (patch) | |
| tree | 581454a3f382e2101b21b665883970d01c21b8d8 /make | |
| parent | 963937709bb6a50735df028b3f672f9d46d2f4b2 (diff) | |
| parent | 4e0ab84c9f5f57bf73f72294789a447f458291f5 (diff) | |
| download | otp-7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff.tar.gz otp-7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff.tar.bz2 otp-7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 9d97677ff4..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1 +0,0 @@ -OTP-15953 |