diff options
| author | Siri Hansen <[email protected]> | 2016-02-29 10:57:29 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-02-29 10:57:29 +0100 |
| commit | 3a09efb729d8fdd3c953ac85e589c8c5fcb67782 (patch) | |
| tree | 7c4927c2d171c406347181ca7687e45fa279015b /lib/kernel | |
| parent | 10a218b37324fd94ddbfe5568554de263492c82c (diff) | |
| parent | 87c77e75cc641b16b3704f8947fe15911fe40fc3 (diff) | |
| download | otp-3a09efb729d8fdd3c953ac85e589c8c5fcb67782.tar.gz otp-3a09efb729d8fdd3c953ac85e589c8c5fcb67782.tar.bz2 otp-3a09efb729d8fdd3c953ac85e589c8c5fcb67782.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 4 |
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 }. |