diff options
| author | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
| commit | 9a1419a7d4325085dc2235a8531d77e1d96ea689 (patch) | |
| tree | ebb7ed16ce92c1c99b44091bee9e4d2a7220ef75 /lib/stdlib/src/stdlib.appup.src | |
| parent | a56f6e3e716c4a2c8f16933e1e30759381c4fdb8 (diff) | |
| parent | 934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff) | |
| download | otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.gz otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.bz2 otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.zip | |
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib/stdlib/src/stdlib.appup.src')
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 22eefb2514..99d9b8b431 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -17,9 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1 + {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.0 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16 %% Down to - max one major revision back - [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + [{<<"2\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1 + {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.0 {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16 }. |