diff options
| author | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-04-01 15:21:52 +0200 |
| commit | 91e6f3a30b8d6e779050f6e7fd418479bc9f9948 (patch) | |
| tree | 59d10763782021dc51ce7471f73f83ce93cf0a8f /lib/stdlib/src | |
| parent | be44d6827e2374a43068b35de85ed16441c771be (diff) | |
| parent | abc64999241276879208d077f9d94101366a414e (diff) | |
| download | otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.gz otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.tar.bz2 otp-91e6f3a30b8d6e779050f6e7fd418479bc9f9948.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/stdlib.appup.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src index 37ea97c353..08612ed17f 100644 --- a/lib/stdlib/src/stdlib.appup.src +++ b/lib/stdlib/src/stdlib.appup.src @@ -41,7 +41,9 @@ {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.7$">>,[restart_new_emulator]}, {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], + {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^3\\.8$">>,[restart_new_emulator]}, + {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], [{<<"^3\\.4$">>,[restart_new_emulator]}, {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -56,4 +58,6 @@ {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^3\\.7$">>,[restart_new_emulator]}, {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, - {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. + {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, + {<<"^3\\.8$">>,[restart_new_emulator]}, + {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. |