diff options
author | Micael Karlberg <[email protected]> | 2011-03-03 18:56:43 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-03 18:56:43 +0100 |
commit | 2a1765542adc276ad8336307d1150a2aab8d837f (patch) | |
tree | 8c9aa8fb9f7c2e1b08e6b28ac1b708beed310664 /erts/emulator | |
parent | 890ccb33dd4ffd754a232a676433b3bc3b469bc0 (diff) | |
parent | c4241524ea42871f6cb601783ea56e18449f7cc1 (diff) | |
download | otp-2a1765542adc276ad8336307d1150a2aab8d837f.tar.gz otp-2a1765542adc276ad8336307d1150a2aab8d837f.tar.bz2 otp-2a1765542adc276ad8336307d1150a2aab8d837f.zip |
Merge branch 'bmk/megaco/miscellaneous_dialyzer/OTP-9075' into dev
Fixing miscellaneous "things" "detected" by dialyzer.
Also updated end date for a number of erts files.
Diffstat (limited to 'erts/emulator')
-rw-r--r-- | erts/emulator/beam/erl_alloc.c | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_alloc.h | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 2 | ||||
-rw-r--r-- | erts/emulator/utils/loaded | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 323c422c6d..775f4435a9 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * Copyright Ericsson AB 2002-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 diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h index dd4cc22171..17ff9c3b03 100644 --- a/erts/emulator/beam/erl_alloc.h +++ b/erts/emulator/beam/erl_alloc.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * Copyright Ericsson AB 2002-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 diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index c09f0bbd77..1394b7e829 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * Copyright Ericsson AB 2002-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 diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 5a8db5e29e..d296081714 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * Copyright Ericsson AB 2002-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 diff --git a/erts/emulator/utils/loaded b/erts/emulator/utils/loaded index 99a66e7fdb..d124a64a78 100644 --- a/erts/emulator/utils/loaded +++ b/erts/emulator/utils/loaded @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2010. All Rights Reserved. +%% Copyright Ericsson AB 1998-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 |