aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2017-03-09 14:29:01 +0100
committerSiri Hansen <[email protected]>2017-03-09 14:29:01 +0100
commita6073a25aae43d17c8afa9a976cbe310552cb811 (patch)
treedc5a87c3b5c1d6f3000ac73107f5c380c27c3d54 /lib
parent0380cf2f9d834eb2c84b5f9c6912396c80806b43 (diff)
parent97fc265ee9349a21c71df78da673456007ff4c92 (diff)
downloadotp-a6073a25aae43d17c8afa9a976cbe310552cb811.tar.gz
otp-a6073a25aae43d17c8afa9a976cbe310552cb811.tar.bz2
otp-a6073a25aae43d17c8afa9a976cbe310552cb811.zip
Merge branch 'maint'
Conflicts: lib/kernel/src/kernel.appup.src lib/stdlib/src/stdlib.appup.src
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/kernel.appup.src4
-rw-r--r--lib/stdlib/src/stdlib.appup.src4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index b505524471..2dc90e2b3e 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,7 +18,7 @@
%% %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.*
%% 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.*
}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 979161fef7..3c9e95e3a9 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,7 +18,7 @@
%% %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.*
%% 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.*
}.