diff options
| author | John Högberg <[email protected]> | 2019-06-17 09:55:54 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-17 09:55:54 +0200 |
| commit | fdb2f749221c97952f042d9f1094c8a77d010dfe (patch) | |
| tree | 61511f8f54f3cabb166b29e0aaa9a7c6eaad1ee9 /make | |
| parent | f5a1e5c56832f82c0f4f1feaaac54f282c5d7f82 (diff) | |
| parent | b228a78ccf59d79da8ba5bcbe7a354206b138595 (diff) | |
| download | otp-fdb2f749221c97952f042d9f1094c8a77d010dfe.tar.gz otp-fdb2f749221c97952f042d9f1094c8a77d010dfe.tar.bz2 otp-fdb2f749221c97952f042d9f1094c8a77d010dfe.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# erts/doc/src/notes.xml
# erts/vsn.mk
# lib/common_test/doc/src/notes.xml
# lib/common_test/vsn.mk
# lib/tools/doc/src/notes.xml
# lib/tools/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index e071f1a430..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,9 +0,0 @@ -OTP-15844 -OTP-15861 -OTP-15862 -OTP-15864 -OTP-15865 -OTP-15871 -OTP-15872 -OTP-15873 -OTP-15875 |