diff options
| author | Erlang/OTP <[email protected]> | 2010-02-11 14:01:55 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-11 15:13:44 +0100 |
| commit | fbd9a5c04658a84b1118861a8cd4ec73f408e011 (patch) | |
| tree | af2132e173e8ce2a80984d9b42fc91668f8d4295 /erts/preloaded/src/otp_ring0.erl | |
| parent | 2a96208cb00220f963e723ae0530492c5c70df27 (diff) | |
| parent | 5cd912152265f2211407493d91d5684639288a69 (diff) | |
| download | otp-fbd9a5c04658a84b1118861a8cd4ec73f408e011.tar.gz otp-fbd9a5c04658a84b1118861a8cd4ec73f408e011.tar.bz2 otp-fbd9a5c04658a84b1118861a8cd4ec73f408e011.zip | |
Merge branch 'ks/erts' into ccase/r13b04_dev
* ks/erts:
hipe_bif0.c: Remove $Id$
erts/preloaded: Add types and specs
Diffstat (limited to 'erts/preloaded/src/otp_ring0.erl')
| -rw-r--r-- | erts/preloaded/src/otp_ring0.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/erts/preloaded/src/otp_ring0.erl b/erts/preloaded/src/otp_ring0.erl index 3b0d562d1f..2ccf142f30 100644 --- a/erts/preloaded/src/otp_ring0.erl +++ b/erts/preloaded/src/otp_ring0.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2000-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 %% 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% %% -module(otp_ring0). @@ -22,6 +22,7 @@ -export([start/2]). +-spec start(_, term()) -> term(). start(_Env, Argv) -> run(init, boot, Argv). |