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/etc | |
| 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/etc')
| -rw-r--r-- | erts/etc/unix/cerl.src | 2 | ||||
| -rw-r--r-- | erts/etc/unix/run_erl.c | 2 | ||||
| -rw-r--r-- | erts/etc/unix/to_erl.c | 2 | ||||
| -rw-r--r-- | erts/etc/win32/erlsrv/erlsrv_interactive.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index 691b32e143..0d45917e4b 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -2,7 +2,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2012. 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/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index a3bcdb85d9..53c779b1be 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2012. All Rights Reserved. + * Copyright Ericsson AB 1996-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/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c index 094006c5fd..0f27b64811 100644 --- a/erts/etc/unix/to_erl.c +++ b/erts/etc/unix/to_erl.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2012. All Rights Reserved. + * Copyright Ericsson AB 1996-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/etc/win32/erlsrv/erlsrv_interactive.c b/erts/etc/win32/erlsrv/erlsrv_interactive.c index c370485ac1..260f0d9b97 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-2011. All Rights Reserved. + * Copyright Ericsson AB 1998-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 |