diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
| commit | 91f8f903ae866d06332a6f2ef968b419339e6003 (patch) | |
| tree | 6ab98b4cd60c4b73be8452619bae86cf90a79723 /erts/emulator/sys/win32 | |
| parent | 87c5ea0577267fd17bcc572ab81bdac030dd8332 (diff) | |
| parent | 2d03ab7ffde828d3b56f8b7738fd0c00d0f5b630 (diff) | |
| download | otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.gz otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.bz2 otp-91f8f903ae866d06332a6f2ef968b419339e6003.zip | |
Merge branch 'maint'
Conflicts:
lib/diameter/autoconf/vxworks/sed.general
xcomp/README.md
Diffstat (limited to 'erts/emulator/sys/win32')
| -rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 2 | ||||
| -rwxr-xr-x | erts/emulator/sys/win32/sys.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys_env.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys_interrupt.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index db4b9999d6..5ce1a61303 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -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/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index 29e2749800..6894d682e7 100755 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -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/erts/emulator/sys/win32/sys_env.c b/erts/emulator/sys/win32/sys_env.c index 658a77c824..754f4c6e4c 100644 --- a/erts/emulator/sys/win32/sys_env.c +++ b/erts/emulator/sys/win32/sys_env.c @@ -1,7 +1,7 @@ /*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2002-2011. All Rights Reserved.
+ * Copyright Ericsson AB 2002-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/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c index a507a19480..36c43e93da 100644 --- a/erts/emulator/sys/win32/sys_interrupt.c +++ b/erts/emulator/sys/win32/sys_interrupt.c @@ -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 |