diff options
| author | Siri Hansen <[email protected]> | 2016-09-27 10:45:18 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-09-27 10:45:18 +0200 |
| commit | 504e93b8c7bfd5d59aa14beaee380c32545b5de1 (patch) | |
| tree | 31fe31a1488e3d51fdb8af3f636e2291afe9ab14 /lib | |
| parent | 7536c2c4903048253658adfb5f7a3ce53274866f (diff) | |
| parent | cd4916b5fa531bdfea77a87bd8f37133955532f9 (diff) | |
| download | otp-504e93b8c7bfd5d59aa14beaee380c32545b5de1.tar.gz otp-504e93b8c7bfd5d59aa14beaee380c32545b5de1.tar.bz2 otp-504e93b8c7bfd5d59aa14beaee380c32545b5de1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -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 d16e200cb3..82cf73cbda 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(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"5\\.[0-1](\\.[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(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"5\\.[0-1](\\.[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 9877662743..e917b7ea1f 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(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"3\\.[0-1](\\.[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(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* + [{<<"3\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.* {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.* }. |