diff options
| author | Micael Karlberg <[email protected]> | 2011-03-25 21:19:05 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-25 21:19:05 +0100 |
| commit | 5396cae69c23d7d8b7bbd0433c3b31144254c7a9 (patch) | |
| tree | a16e52267f14417155e938ee5f34cc5082efc314 /bootstrap/bin | |
| parent | 143cc965e88ea2486c1e6b804f2ae033e870de2d (diff) | |
| parent | f0e2f0b91ac4d45a64ddac511e0eba9b6ce01e92 (diff) | |
| download | otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.tar.gz otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.tar.bz2 otp-5396cae69c23d7d8b7bbd0433c3b31144254c7a9.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'bootstrap/bin')
| -rw-r--r-- | bootstrap/bin/start.boot | bin | 5330 -> 5330 bytes | |||
| -rw-r--r-- | bootstrap/bin/start.script | 8 | ||||
| -rw-r--r-- | bootstrap/bin/start_clean.boot | bin | 5330 -> 5330 bytes | |||
| -rw-r--r-- | bootstrap/bin/start_clean.script | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot Binary files differindex c7f5785eee..19185aed5b 100644 --- a/bootstrap/bin/start.boot +++ b/bootstrap/bin/start.boot diff --git a/bootstrap/bin/start.script b/bootstrap/bin/start.script index c5106e3709..a95c743f22 100644 --- a/bootstrap/bin/start.script +++ b/bootstrap/bin/start.script @@ -1,6 +1,6 @@ -%% script generated at {2010,12,3} {17,41,47} +%% script generated at {2011,3,11} {15,30,43} {script, - {"OTP APN 181 01","R14B01"}, + {"OTP APN 181 01","R14B02"}, [{preLoaded, [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip, zlib]}, @@ -43,7 +43,7 @@ {application_controller,start, [{application,kernel, [{description,"ERTS CXC 138 10"}, - {vsn,"2.14.2"}, + {vsn,"2.14.3"}, {id,[]}, {modules, [application,application_controller,application_master, @@ -80,7 +80,7 @@ {application,load, [{application,stdlib, [{description,"ERTS CXC 138 10"}, - {vsn,"1.17.2"}, + {vsn,"1.17.3"}, {id,[]}, {modules, [array,base64,beam_lib,binary,c,calendar,dets, diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot Binary files differindex c7f5785eee..19185aed5b 100644 --- a/bootstrap/bin/start_clean.boot +++ b/bootstrap/bin/start_clean.boot diff --git a/bootstrap/bin/start_clean.script b/bootstrap/bin/start_clean.script index c5106e3709..a95c743f22 100644 --- a/bootstrap/bin/start_clean.script +++ b/bootstrap/bin/start_clean.script @@ -1,6 +1,6 @@ -%% script generated at {2010,12,3} {17,41,47} +%% script generated at {2011,3,11} {15,30,43} {script, - {"OTP APN 181 01","R14B01"}, + {"OTP APN 181 01","R14B02"}, [{preLoaded, [erl_prim_loader,erlang,init,otp_ring0,prim_file,prim_inet,prim_zip, zlib]}, @@ -43,7 +43,7 @@ {application_controller,start, [{application,kernel, [{description,"ERTS CXC 138 10"}, - {vsn,"2.14.2"}, + {vsn,"2.14.3"}, {id,[]}, {modules, [application,application_controller,application_master, @@ -80,7 +80,7 @@ {application,load, [{application,stdlib, [{description,"ERTS CXC 138 10"}, - {vsn,"1.17.2"}, + {vsn,"1.17.3"}, {id,[]}, {modules, [array,base64,beam_lib,binary,c,calendar,dets, |