diff options
| author | Rickard Green <rickard@erlang.org> | 2020-04-06 15:00:38 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-04-06 15:00:38 +0200 |
| commit | 72fea520e676b194ce0358e7331208d2c1e75411 (patch) | |
| tree | 2cbdd1e66d7671514a87a62716cfcebbdbb0309c /make | |
| parent | f8e064a45af4ea927ab439be273b0307843fd559 (diff) | |
| parent | 0ccb19beee5211b1a7a4d5f6a735563507e71db0 (diff) | |
| download | erlang-72fea520e676b194ce0358e7331208d2c1e75411.tar.gz | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# lib/stdlib/src/stdlib.app.src
# make/otp_version_tickets_in_merge
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_version_tickets_in_merge | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge index a28ea26678..e69de29bb2 100644 --- a/make/otp_version_tickets_in_merge +++ b/make/otp_version_tickets_in_merge @@ -1,62 +0,0 @@ -OTP-14644 -OTP-15856 -OTP-16039 -OTP-16046 -OTP-16059 -OTP-16153 -OTP-16158 -OTP-16212 -OTP-16253 -OTP-16258 -OTP-16306 -OTP-16309 -OTP-16321 -OTP-16322 -OTP-16340 -OTP-16348 -OTP-16350 -OTP-16351 -OTP-16352 -OTP-16353 -OTP-16356 -OTP-16364 -OTP-16377 -OTP-16380 -OTP-16381 -OTP-16384 -OTP-16387 -OTP-16399 -OTP-16404 -OTP-16412 -OTP-16414 -OTP-16417 -OTP-16418 -OTP-16420 -OTP-16425 -OTP-16427 -OTP-16428 -OTP-16435 -OTP-16437 -OTP-16438 -OTP-16439 -OTP-16440 -OTP-16447 -OTP-16449 -OTP-16450 -OTP-16458 -OTP-16468 -OTP-16472 -OTP-16475 -OTP-16476 -OTP-16477 -OTP-16479 -OTP-16481 -OTP-16485 -OTP-16491 -OTP-16493 -OTP-16498 -OTP-16514 -OTP-16515 -OTP-16528 -OTP-16542 -OTP-16548 |