aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-10-02 10:16:53 +0200
committerSiri Hansen <[email protected]>2014-10-02 10:16:53 +0200
commitadfb6f664c2137c735e7237725ff60224b95ce44 (patch)
treec82ef41572f245ff47d86c1bfc3fdb3f773c0c75 /lib
parent02575ed55c4e89ed21223124314517ccce12b74d (diff)
parentfec05d96ce4d9cc77bd3dfb06e474600854c6dd8 (diff)
downloadotp-adfb6f664c2137c735e7237725ff60224b95ce44.tar.gz
otp-adfb6f664c2137c735e7237725ff60224b95ce44.tar.bz2
otp-adfb6f664c2137c735e7237725ff60224b95ce44.zip
Merge branch 'maint'
Conflicts: lib/stdlib/src/stdlib.appup.src
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/stdlib.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index e718fce140..5900fd3ff3 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -17,9 +17,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1
+ [{<<"2\\.[1-2](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0
%% Down to - max one major revision back
- [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1
+ [{<<"2\\.[1-2](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0
}.