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/bin/start.script | |
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/bin/start.script')
-rw-r--r-- | bootstrap/bin/start.script | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap/bin/start.script b/bootstrap/bin/start.script index a95c743f22..ba1aed08e7 100644 --- a/bootstrap/bin/start.script +++ b/bootstrap/bin/start.script @@ -1,6 +1,6 @@ -%% script generated at {2011,3,11} {15,30,43} +%% script generated at {2011,3,30} {10,45,5} {script, - {"OTP APN 181 01","R14B02"}, + {"OTP APN 181 01","R14B03"}, [{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.3"}, + {vsn,"2.14.4"}, {id,[]}, {modules, [application,application_controller,application_master, @@ -80,7 +80,7 @@ {application,load, [{application,stdlib, [{description,"ERTS CXC 138 10"}, - {vsn,"1.17.3"}, + {vsn,"1.17.4"}, {id,[]}, {modules, [array,base64,beam_lib,binary,c,calendar,dets, |