aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-05-27 10:44:06 +0200
committerHans Bolinder <[email protected]>2015-05-27 10:44:06 +0200
commita8a30c4852fe800ba91efa4b78e4980f8eebc904 (patch)
tree3dd7fda48a9a5682302d878763d5bdc40ea0b9e0 /lib/stdlib/src
parent50cdb87765cd46e0a809d97f62df28baf8a2c16a (diff)
parent8d4b54db1b4756ea52ebc72df76ae5f13e276d9a (diff)
downloadotp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.tar.gz
otp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.tar.bz2
otp-a8a30c4852fe800ba91efa4b78e4980f8eebc904.zip
Merge branch 'hb/update_versions'
* hb/update_versions: Update application versions
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/stdlib.appup.src8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index ee87a8ddb2..b3569c2848 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -1,7 +1,7 @@
%% -*- erlang -*-
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -17,9 +17,7 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"2\\.[1-3](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
- {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0
+ [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0-17.5
%% Down to - max one major revision back
- [{<<"2\\.[1-3](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3
- {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0
+ [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0-17.5
}.