diff options
| author | Siri Hansen <[email protected]> | 2017-03-09 14:29:01 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-03-09 14:29:01 +0100 |
| commit | a6073a25aae43d17c8afa9a976cbe310552cb811 (patch) | |
| tree | dc5a87c3b5c1d6f3000ac73107f5c380c27c3d54 /lib/stdlib/src | |
| parent | 0380cf2f9d834eb2c84b5f9c6912396c80806b43 (diff) | |
| parent | 97fc265ee9349a21c71df78da673456007ff4c92 (diff) | |
| download | otp-a6073a25aae43d17c8afa9a976cbe310552cb811.tar.gz otp-a6073a25aae43d17c8afa9a976cbe310552cb811.tar.bz2 otp-a6073a25aae43d17c8afa9a976cbe310552cb811.zip | |
Merge branch 'maint'
Conflicts:
lib/kernel/src/kernel.appup.src
lib/stdlib/src/stdlib.appup.src
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 979161fef7..3c9e95e3a9 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -18,7 +18,7 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"3\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-19.* %% Down to - max one major revision back - [{<<"3\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* + [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-19.* }. |