diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
| commit | 473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch) | |
| tree | 689908bd116af888e4ed7659da9b7c4af9ba4c7d /erts/emulator/test | |
| parent | 7b9f93973c877af5be57add78bc0d00321ed5931 (diff) | |
| parent | 710b07ca18417976459335a8b0b81a6f6aa82699 (diff) | |
| download | otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2 otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/alloc_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/emulator/test/code_parallel_load_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/emulator/test/send_term_SUITE.erl | 2 | ||||
| -rw-r--r-- | erts/emulator/test/trace_SUITE.erl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl index 33abd45982..801ed0f85a 100644 --- a/erts/emulator/test/alloc_SUITE.erl +++ b/erts/emulator/test/alloc_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2011. All Rights Reserved. +%% Copyright Ericsson AB 2003-2013. 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/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index 1e924a0fee..fe0a745db8 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. 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/test/code_parallel_load_SUITE.erl b/erts/emulator/test/code_parallel_load_SUITE.erl index d2c80c1ca0..1cfe015ea6 100644 --- a/erts/emulator/test/code_parallel_load_SUITE.erl +++ b/erts/emulator/test/code_parallel_load_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012. All Rights Reserved. +%% Copyright Ericsson AB 2012-2013. 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/test/send_term_SUITE.erl b/erts/emulator/test/send_term_SUITE.erl index 6615873392..b631f55a03 100644 --- a/erts/emulator/test/send_term_SUITE.erl +++ b/erts/emulator/test/send_term_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2013. 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/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl index caa58ae281..0f513f0dcb 100644 --- a/erts/emulator/test/trace_SUITE.erl +++ b/erts/emulator/test/trace_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. 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 |