diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
| commit | 4ba372e01009c36a9fea40a5d8b3c8e85284d102 (patch) | |
| tree | 488a6c5701f57793fb852a40733dfbe68aabe920 /lib/kernel/src | |
| parent | 9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff) | |
| parent | ce4431b33d18c04f4166def737b2aed582e4426a (diff) | |
| download | otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2 otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/auth.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/code_server.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/file_io_server.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/global.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/inet.erl | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl index 252c20ac4e..6ae786ebd9 100644 --- a/lib/kernel/src/auth.erl +++ b/lib/kernel/src/auth.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. 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/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index 5d4f2eb70c..a2db7c9790 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2011. All Rights Reserved. +%% Copyright Ericsson AB 1998-2012. 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/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl index 7311ad9fee..0bff56cf46 100644 --- a/lib/kernel/src/file_io_server.erl +++ b/lib/kernel/src/file_io_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2010. All Rights Reserved. +%% Copyright Ericsson AB 2000-2012. 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/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 56d0451e44..ef6bfdf7f4 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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/lib/kernel/src/global.erl b/lib/kernel/src/global.erl index 7da33859bf..36cb713ee1 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. 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/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 4de3c1c6b1..abaf4486dc 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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 |