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/lib/kernel | |
| 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/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 2 |
1 files changed, 1 insertions, 1 deletions
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 |