diff options
| author | Siri Hansen <[email protected]> | 2013-04-16 09:35:11 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-16 09:35:11 +0200 |
| commit | e4d8cbb58f7ed45098c2bfcd652e18693332c94e (patch) | |
| tree | e6ca001294a9a809025bec8d3e194fd8c66ca8e0 /lib/kernel/src | |
| parent | 34cfc2bfbf4fdbab0dfafb6dced5e555bb8fa594 (diff) | |
| parent | efa025efd47516f58c429a7ec91f6c002e3a9170 (diff) | |
| download | otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.tar.gz otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.tar.bz2 otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.zip | |
Merge branch 'siri/appup-for-r17/OTP-10950'
* siri/appup-for-r17/OTP-10950:
Update sasl version and sasl.appup.src for R17
Update stdlib.appup.src for R17
Update kernel.appup.src for R17
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 54628800a8..ae2666d496 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -1,7 +1,7 @@ %% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2011. All Rights Reserved. +%% Copyright Ericsson AB 1999-2013. 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,11 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max two major revisions back - [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 - {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14 + [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15 %% Down to - max two major revisions back - [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 - {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 - {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14 + [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 }. |