diff options
| author | Björn Gustavsson <[email protected]> | 2015-01-21 10:17:46 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-01-21 10:17:46 +0100 |
| commit | 046751dc8ca305a390aa4cf9ee132f0190d809f5 (patch) | |
| tree | c723b2d314ea2fe44cf6c527dc2365c6e63d1acc /bootstrap | |
| parent | 1d0efcad490cb87c292c0505edbadb452b39b1a2 (diff) | |
| parent | 2249ed70a95b238d37164a64abecfbde76f7dec2 (diff) | |
| download | otp-046751dc8ca305a390aa4cf9ee132f0190d809f5.tar.gz otp-046751dc8ca305a390aa4cf9ee132f0190d809f5.tar.bz2 otp-046751dc8ca305a390aa4cf9ee132f0190d809f5.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
core_lib: Handle patterns in map values
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/lib/compiler/ebin/core_lib.beam | bin | 5980 -> 6120 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 2 | ||||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/stdlib.appup | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/lib/compiler/ebin/core_lib.beam b/bootstrap/lib/compiler/ebin/core_lib.beam Binary files differindex bb38837049..54f43c6c10 100644 --- a/bootstrap/lib/compiler/ebin/core_lib.beam +++ b/bootstrap/lib/compiler/ebin/core_lib.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup index 02cf129b42..3ff5aa73f0 100644 --- a/bootstrap/lib/kernel/ebin/kernel.appup +++ b/bootstrap/lib/kernel/ebin/kernel.appup @@ -15,7 +15,7 @@ %% under the License. %% %% %CopyrightEnd% -{"3.0.3", +{"3.1", %% Up from - max one major revision back [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup index 541b1925e5..37251e8e2d 100644 --- a/bootstrap/lib/stdlib/ebin/stdlib.appup +++ b/bootstrap/lib/stdlib/ebin/stdlib.appup @@ -15,7 +15,7 @@ %% under the License. %% %% %CopyrightEnd% -{"2.2", +{"2.3", %% Up from - max one major revision back [{<<"2\\.[1-2](\\.[0-9]+)*">>,[restart_new_emulator]}, %% 17.1-17.3 {<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0 |