aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-03-27 17:05:08 +0100
committerSverker Eriksson <[email protected]>2015-03-27 17:05:08 +0100
commitcd80b9205944583ce5a2b7db3f5ec28e25a527a1 (patch)
treea59be55645ed8b7b1e8a050e03291203a56633e8 /lib
parentbe89d435fbde795bcdc62b99529c5f77d42c6b62 (diff)
parentcbceea683c9f718bc6f0140c2402a7f74455ea14 (diff)
downloadotp-cd80b9205944583ce5a2b7db3f5ec28e25a527a1.tar.gz
otp-cd80b9205944583ce5a2b7db3f5ec28e25a527a1.tar.bz2
otp-cd80b9205944583ce5a2b7db3f5ec28e25a527a1.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 5900fd3ff3..ee87a8ddb2 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-2](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
+ [{<<"2\\.[1-3](\\.[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-2](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
+ [{<<"2\\.[1-3](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0
}.