diff options
| author | Lars Thorsen <[email protected]> | 2019-05-20 13:00:41 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2019-05-20 13:00:42 +0200 |
| commit | e7439a60c700d7f0c73fa6796a1bff6ab5f39d0c (patch) | |
| tree | 3ac861424c5abbea872324d4317d610a9f1ef134 /make | |
| parent | f956281f92756d21bb43aa7cdc59db1cedc0eb7c (diff) | |
| parent | 2bcc317861b118461376766692968775ab405cef (diff) | |
| download | otp-e7439a60c700d7f0c73fa6796a1bff6ab5f39d0c.tar.gz otp-e7439a60c700d7f0c73fa6796a1bff6ab5f39d0c.tar.bz2 otp-e7439a60c700d7f0c73fa6796a1bff6ab5f39d0c.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/xmerl/doc/src/notes.xml
# lib/xmerl/vsn.mk
# make/otp_version_tickets
# otp_versions.table
Diffstat (limited to 'make')
0 files changed, 0 insertions, 0 deletions