diff options
| author | Henrik Nord <[email protected]> | 2018-12-11 10:11:27 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2018-12-11 10:11:27 +0100 |
| commit | bdbea55aa52890ebb42459d726464e5a1ee1488b (patch) | |
| tree | 372fd0d09ac7bbd8759cee9cfe56fd5619db9da9 /lib/kernel/src/kernel.appup.src | |
| parent | 1fda01cb73f7f22cccf4de29a739397a9b86eda3 (diff) | |
| parent | 3825199794da28d79b21052a2e69e2335921d55e (diff) | |
| download | otp-bdbea55aa52890ebb42459d726464e5a1ee1488b.tar.gz otp-bdbea55aa52890ebb42459d726464e5a1ee1488b.tar.bz2 otp-bdbea55aa52890ebb42459d726464e5a1ee1488b.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Diffstat (limited to 'lib/kernel/src/kernel.appup.src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index e73cea8351..ccf0a82ced 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -39,7 +39,8 @@ {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.1$">>,[restart_new_emulator]}, - {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], + {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], [{<<"^5\\.3$">>,[restart_new_emulator]}, {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -52,4 +53,5 @@ {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.1$">>,[restart_new_emulator]}, - {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. + {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. |