diff options
| author | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
| commit | 4346b5dae76052e8c06b1cda70d561b10c1c486d (patch) | |
| tree | 8de6b459b429aa24e1bd9738a4fb3b6e07a083a8 /bootstrap/lib/stdlib/ebin | |
| parent | 3bc0fccb951ffb0909d2824b65d58ad31ad16cc5 (diff) | |
| parent | d8dcd70f386de09109ca1f6f817a381cd1387769 (diff) | |
| download | otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.gz otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.bz2 otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.zip | |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'bootstrap/lib/stdlib/ebin')
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_parse.beam | bin | 66228 -> 66332 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_pp.beam | bin | 21540 -> 21384 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/log_mf_h.beam | bin | 2376 -> 2444 bytes | |||
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/stdlib.app | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/lib/stdlib/ebin/erl_parse.beam b/bootstrap/lib/stdlib/ebin/erl_parse.beam Binary files differindex 5d62fa70df..753080584f 100644 --- a/bootstrap/lib/stdlib/ebin/erl_parse.beam +++ b/bootstrap/lib/stdlib/ebin/erl_parse.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_pp.beam b/bootstrap/lib/stdlib/ebin/erl_pp.beam Binary files differindex 2b6f0a5bd6..8036376515 100644 --- a/bootstrap/lib/stdlib/ebin/erl_pp.beam +++ b/bootstrap/lib/stdlib/ebin/erl_pp.beam diff --git a/bootstrap/lib/stdlib/ebin/log_mf_h.beam b/bootstrap/lib/stdlib/ebin/log_mf_h.beam Binary files differindex 70b887857c..04c1bf5824 100644 --- a/bootstrap/lib/stdlib/ebin/log_mf_h.beam +++ b/bootstrap/lib/stdlib/ebin/log_mf_h.beam diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app index 629a0c5517..ac8b4ec113 100644 --- a/bootstrap/lib/stdlib/ebin/stdlib.app +++ b/bootstrap/lib/stdlib/ebin/stdlib.app @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2010. 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 @@ -19,7 +19,7 @@ %% {application, stdlib, [{description, "ERTS CXC 138 10"}, - {vsn, "1.17.3"}, + {vsn, "1.17.4"}, {modules, [array, base64, beam_lib, |