diff options
| author | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
| commit | 101a2bdd5c48f38803c274603844c69296a3b935 (patch) | |
| tree | fd9e949322565dde54ae26958b798fed4c3bc837 /bootstrap/lib/kernel/ebin | |
| parent | b56002c163ff5f811da902129dd4b2f37edc226d (diff) | |
| parent | f0e2f0b91ac4d45a64ddac511e0eba9b6ce01e92 (diff) | |
| download | otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.gz otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.bz2 otp-101a2bdd5c48f38803c274603844c69296a3b935.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'bootstrap/lib/kernel/ebin')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/code.beam | bin | 6352 -> 6284 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/file.beam | bin | 11488 -> 11368 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/global.beam | bin | 29308 -> 29312 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/hipe_unified_loader.beam | bin | 11428 -> 11432 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet.beam | bin | 18176 -> 18124 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam | bin | 5856 -> 5832 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 4 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.appup | 2 | ||||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/net_kernel.beam | bin | 21108 -> 21032 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/os.beam | bin | 4852 -> 4872 bytes |
10 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam Binary files differindex 18947d98c3..960b96ce4c 100644 --- a/bootstrap/lib/kernel/ebin/code.beam +++ b/bootstrap/lib/kernel/ebin/code.beam diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam Binary files differindex 343cee3fe7..39af418b30 100644 --- a/bootstrap/lib/kernel/ebin/file.beam +++ b/bootstrap/lib/kernel/ebin/file.beam diff --git a/bootstrap/lib/kernel/ebin/global.beam b/bootstrap/lib/kernel/ebin/global.beam Binary files differindex 525d4ebdfa..333dd35c7e 100644 --- a/bootstrap/lib/kernel/ebin/global.beam +++ b/bootstrap/lib/kernel/ebin/global.beam diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam Binary files differindex 0c39512bb3..5819c340b3 100644 --- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam +++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam diff --git a/bootstrap/lib/kernel/ebin/inet.beam b/bootstrap/lib/kernel/ebin/inet.beam Binary files differindex 622110bcdb..52dc98319f 100644 --- a/bootstrap/lib/kernel/ebin/inet.beam +++ b/bootstrap/lib/kernel/ebin/inet.beam diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam Binary files differindex c2dac7dee1..05d8da8751 100644 --- a/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam +++ b/bootstrap/lib/kernel/ebin/inet6_tcp_dist.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 5ea0891375..920213d720 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 @@ -21,7 +21,7 @@ {application, kernel, [ {description, "ERTS CXC 138 10"}, - {vsn, "2.14.2"}, + {vsn, "2.14.3"}, {modules, [application, application_controller, application_master, diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup index 77f9f42fea..f287e992f1 100644 --- a/bootstrap/lib/kernel/ebin/kernel.appup +++ b/bootstrap/lib/kernel/ebin/kernel.appup @@ -1 +1 @@ -{"2.14.2",[],[]}. +{"2.14.3",[],[]}. diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam Binary files differindex 1245322a7d..2e79781da8 100644 --- a/bootstrap/lib/kernel/ebin/net_kernel.beam +++ b/bootstrap/lib/kernel/ebin/net_kernel.beam diff --git a/bootstrap/lib/kernel/ebin/os.beam b/bootstrap/lib/kernel/ebin/os.beam Binary files differindex e73189921f..cd112bb1cf 100644 --- a/bootstrap/lib/kernel/ebin/os.beam +++ b/bootstrap/lib/kernel/ebin/os.beam |