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 /erts/etc/win32 | |
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 'erts/etc/win32')
-rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_interactive.c | 2 | ||||
-rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_interactive.h | 2 | ||||
-rw-r--r-- | erts/etc/win32/start_erl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/etc/win32/erlsrv/erlsrv_interactive.c b/erts/etc/win32/erlsrv/erlsrv_interactive.c index 4c990a694d..736eabac79 100644 --- a/erts/etc/win32/erlsrv/erlsrv_interactive.c +++ b/erts/etc/win32/erlsrv/erlsrv_interactive.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2009. 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 diff --git a/erts/etc/win32/erlsrv/erlsrv_interactive.h b/erts/etc/win32/erlsrv/erlsrv_interactive.h index 602da24575..23e69e508d 100644 --- a/erts/etc/win32/erlsrv/erlsrv_interactive.h +++ b/erts/etc/win32/erlsrv/erlsrv_interactive.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2009. 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 diff --git a/erts/etc/win32/start_erl.c b/erts/etc/win32/start_erl.c index 6ca7dd9b99..28c8e55bd3 100644 --- a/erts/etc/win32/start_erl.c +++ b/erts/etc/win32/start_erl.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2009. 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 |