diff options
| author | Micael Karlberg <[email protected]> | 2019-04-17 11:59:06 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-04-17 11:59:06 +0200 |
| commit | 143682bb10ff77971ea93fb9c3d502d0451276d6 (patch) | |
| tree | 225f22ad2c64d53a845c838c79f4fc1855cea27b /make | |
| parent | c24da18e02cf20f1a08d7a25f94ca9c841d73d85 (diff) | |
| parent | 22a55c40254cfee683e070167794fab632bef865 (diff) | |
| download | otp-143682bb10ff77971ea93fb9c3d502d0451276d6.tar.gz otp-143682bb10ff77971ea93fb9c3d502d0451276d6.tar.bz2 otp-143682bb10ff77971ea93fb9c3d502d0451276d6.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/erl_interface/doc/src/notes.xml
# lib/erl_interface/vsn.mk
# lib/snmp/doc/src/notes.xml
# lib/snmp/vsn.mk
# lib/ssh/doc/src/notes.xml
# lib/ssh/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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index 52e2e9cb78..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,3 +0,0 @@ -OTP-15766 -OTP-15768 -OTP-15769 |