aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-02-29 10:55:45 +0100
committerSiri Hansen <[email protected]>2016-02-29 10:55:45 +0100
commit87c77e75cc641b16b3704f8947fe15911fe40fc3 (patch)
tree349f45cd10b05a7b37dd907c787048e90b792f97 /lib/kernel/src
parent6945d1266486d546aa1a591799591fa1e28e1b1d (diff)
parentdf5c9acc3a73a95cddda9f3a5206d4cb4319a9aa (diff)
downloadotp-87c77e75cc641b16b3704f8947fe15911fe40fc3.tar.gz
otp-87c77e75cc641b16b3704f8947fe15911fe40fc3.tar.bz2
otp-87c77e75cc641b16b3704f8947fe15911fe40fc3.zip
Merge branch 'siri/appups-18.3' into maint
* siri/appups-18.3: Update appups in kernel, stdlib and sasl for OTP-18.3
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/kernel.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 860d3640d0..cc9e6f771a 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
- [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
+ [{<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
%% Down to - max one major revision back
- [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
+ [{<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17
}.