diff options
| author | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2018-09-21 12:25:11 +0200 |
| commit | e3cdf8208a08fe6ceb283108729aee6315af9547 (patch) | |
| tree | 124403a63fd4ed09e029b46ecf30f87660fbacf3 /erts/emulator/sys | |
| parent | ab62dd2e77afac117f431bda449da811b140c153 (diff) | |
| parent | d04b53936d5e9f84a3066ecd466993671b1428bf (diff) | |
| download | otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.gz otp-e3cdf8208a08fe6ceb283108729aee6315af9547.tar.bz2 otp-e3cdf8208a08fe6ceb283108729aee6315af9547.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/common/erl_osenv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 2 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/erl_poll.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/sys/common/erl_osenv.c b/erts/emulator/sys/common/erl_osenv.c index 487ff87116..6a16377736 100644 --- a/erts/emulator/sys/common/erl_osenv.c +++ b/erts/emulator/sys/common/erl_osenv.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2017. All Rights Reserved. + * Copyright Ericsson AB 2017-2018. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 36579ffdb4..4823e549ea 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2017. All Rights Reserved. + * Copyright Ericsson AB 1996-2018. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c index fcf5a0d533..39bb4d515e 100644 --- a/erts/emulator/sys/win32/erl_poll.c +++ b/erts/emulator/sys/win32/erl_poll.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2007-2017. All Rights Reserved. + * Copyright Ericsson AB 2007-2018. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |