diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
| commit | dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8 (patch) | |
| tree | 34db633841db4d5d9ec41ee198823292a711e7a4 /lib/kernel | |
| parent | 0dc1b3b039628cb154fa04dd06b0a138f95b6e7e (diff) | |
| parent | 0534391319767818b036dbce212610a7372da692 (diff) | |
| download | otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.gz otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.bz2 otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/heart.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/test/global_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/test/heart_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/test/wrap_log_reader_SUITE.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml index 2826d3d00a..2856d84dcf 100644 --- a/lib/kernel/doc/src/heart.xml +++ b/lib/kernel/doc/src/heart.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1996</year><year>2011</year> + <year>1996</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl index 6eb2134644..1cc3eb7c79 100644 --- a/lib/kernel/test/global_SUITE.erl +++ b/lib/kernel/test/global_SUITE.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/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl index 970a03cfd5..2ec3b7c297 100644 --- a/lib/kernel/test/heart_SUITE.erl +++ b/lib/kernel/test/heart_SUITE.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/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl index 6c47fda9c5..16b3a7cc1e 100644 --- a/lib/kernel/test/wrap_log_reader_SUITE.erl +++ b/lib/kernel/test/wrap_log_reader_SUITE.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 |