diff options
| author | John Högberg <[email protected]> | 2019-07-03 10:11:10 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-07-03 10:11:10 +0200 |
| commit | 9e49cf35723d7436dbd0ec2f3c8da165b6eb906a (patch) | |
| tree | 28240ad96cc2aab6382dbb644dc96c4f66f3c652 /make | |
| parent | 9b7ec52ecddf845ea07a90ddcfc0868b8a3e7afd (diff) | |
| parent | 1be06fca56f5a13894b5317292fb3077d99e27d5 (diff) | |
| download | otp-9e49cf35723d7436dbd0ec2f3c8da165b6eb906a.tar.gz otp-9e49cf35723d7436dbd0ec2f3c8da165b6eb906a.tar.bz2 otp-9e49cf35723d7436dbd0ec2f3c8da165b6eb906a.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# 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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index fd9b36720a..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,6 +0,0 @@ -OTP-15805 -OTP-15819 -OTP-15867 -OTP-15879 -OTP-15887 -OTP-15888 |