diff options
author | Björn Gustavsson <[email protected]> | 2012-06-25 15:37:43 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2012-06-25 15:37:43 +0200 |
commit | 2af66d1761c54e0bc2811a2ad2950f62d9ceccdc (patch) | |
tree | 8462176f1ed1ea898cd9a6681c855aea7046e7d6 /bootstrap/lib/stdlib/ebin/stdlib.appup | |
parent | b81fcd916e10ca10f3e65c02f005bfe770275dce (diff) | |
parent | 5a12a0605b06a4971f7005b26f6591de9c69837d (diff) | |
download | otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.tar.gz otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.tar.bz2 otp-2af66d1761c54e0bc2811a2ad2950f62d9ceccdc.zip |
Merge branch 'maint'
* maint:
Update primary bootstrap
sys_pre_expand: Eliminate bottleneck for modules with many functions
Conflicts:
bootstrap/bin/start.boot
bootstrap/bin/start_clean.boot
bootstrap/lib/kernel/ebin/file.beam
bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
Diffstat (limited to 'bootstrap/lib/stdlib/ebin/stdlib.appup')
-rw-r--r-- | bootstrap/lib/stdlib/ebin/stdlib.appup | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup new file mode 100644 index 0000000000..ff9b5387c9 --- /dev/null +++ b/bootstrap/lib/stdlib/ebin/stdlib.appup @@ -0,0 +1,27 @@ +%% -*- erlang -*- +%% %CopyrightBegin% +%% +%% Copyright Ericsson AB 1999-2011. All Rights Reserved. +%% +%% The contents of this file are subject to the Erlang Public License, +%% Version 1.1, (the "License"); you may not use this file except in +%% compliance with the License. You should have received a copy of the +%% Erlang Public License along with this software. If not, it can be +%% retrieved online at http://www.erlang.org/. +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +%% the License for the specific language governing rights and limitations +%% under the License. +%% +%% %CopyrightEnd% +{"1.19", + %% Up from - max two major revisions back + [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 + {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14 + %% Down to - max two major revisions back + [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 + {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14 +}. |