diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
commit | 622daf3b96666f8bbabec44a15b26a188a83b95e (patch) | |
tree | 706377087e70525e9bdc68b2f98911d56b915e5d /lib/gs | |
parent | 09c46998b3a4b0060b3ff3799c142d564f91f517 (diff) | |
parent | 5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff) | |
download | otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2 otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip |
Merge branch 'dev' into major
* dev:
Update copyright years
Diffstat (limited to 'lib/gs')
-rw-r--r-- | lib/gs/contribs/bonk/sounder.erl | 2 | ||||
-rw-r--r-- | lib/gs/contribs/cols/cols.erl | 2 | ||||
-rw-r--r-- | lib/gs/contribs/mandel/mandel.erl | 2 | ||||
-rw-r--r-- | lib/gs/contribs/othello/othello_board.erl | 2 | ||||
-rw-r--r-- | lib/gs/examples/calc2.erl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/gs/contribs/bonk/sounder.erl b/lib/gs/contribs/bonk/sounder.erl index 899f20d4e0..e6f69a1616 100644 --- a/lib/gs/contribs/bonk/sounder.erl +++ b/lib/gs/contribs/bonk/sounder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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/lib/gs/contribs/cols/cols.erl b/lib/gs/contribs/cols/cols.erl index 439eb717f7..111c9a58f1 100644 --- a/lib/gs/contribs/cols/cols.erl +++ b/lib/gs/contribs/cols/cols.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl index 579f8e487b..0f1df5c665 100644 --- a/lib/gs/contribs/mandel/mandel.erl +++ b/lib/gs/contribs/mandel/mandel.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl index 6ccb79b7e4..212ba9bfe1 100644 --- a/lib/gs/contribs/othello/othello_board.erl +++ b/lib/gs/contribs/othello/othello_board.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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/lib/gs/examples/calc2.erl b/lib/gs/examples/calc2.erl index 9969a6c40f..0e841397f6 100644 --- a/lib/gs/examples/calc2.erl +++ b/lib/gs/examples/calc2.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 |