diff options
author | Siri Hansen <[email protected]> | 2017-03-09 14:00:55 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-03-09 14:00:55 +0100 |
commit | 97fc265ee9349a21c71df78da673456007ff4c92 (patch) | |
tree | 96981f23b00a0746f6c1ceb38edd80d78f4f6953 | |
parent | b232c720a69bd12717ef880f5ee8ac696c4514f0 (diff) | |
parent | a0381d6ee2164bf8ae03d5b9fb01f0dfaf5b394f (diff) | |
download | otp-97fc265ee9349a21c71df78da673456007ff4c92.tar.gz otp-97fc265ee9349a21c71df78da673456007ff4c92.tar.bz2 otp-97fc265ee9349a21c71df78da673456007ff4c92.zip |
Merge branch 'siri/appups-19.3' into maint
* siri/appups-19.3:
Update appups in kernel and stdlib for OTP-19.3
-rw-r--r-- | lib/kernel/src/kernel.appup.src | 4 | ||||
-rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 82cf73cbda..15e9e7c462 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -18,9 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-18.* %% Down to - max one major revision back - [{<<"5\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"5\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.* }. diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index e917b7ea1f..42c9d6e182 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -18,9 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-18.* %% Down to - max one major revision back - [{<<"3\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.* }. |