diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-04 09:23:17 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-04 09:23:17 +0200 |
| commit | c8ca7f3a2e4583c71e7aa740ede1a2630c09f064 (patch) | |
| tree | cc27470d2652b19d8aa3da6928298f09c32e4706 /make | |
| parent | 3c62fb76b0ac56f3cf8d3f8abac20cd34b02e985 (diff) | |
| parent | 9127de8d0204755a7a95b674e77c6aa0583efce0 (diff) | |
| download | otp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.tar.gz otp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.tar.bz2 otp-c8ca7f3a2e4583c71e7aa740ede1a2630c09f064.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/kernel/doc/src/notes.xml
# lib/kernel/src/kernel.appup.src
# lib/kernel/vsn.mk
# lib/ssl/doc/src/notes.xml
# lib/ssl/vsn.mk
# lib/stdlib/doc/src/notes.xml
# lib/stdlib/src/stdlib.appup.src
# lib/stdlib/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index a9ca1cb131..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,11 +0,0 @@ -OTP-15828 -OTP-15829 -OTP-15832 -OTP-15834 -OTP-15838 -OTP-15839 -OTP-15841 -OTP-15845 -OTP-15846 -OTP-15847 -OTP-15848 |