diff options
| author | Dan Gudmundsson <[email protected]> | 2016-12-07 15:05:52 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-12-07 15:05:52 +0100 |
| commit | ba1d721c4af43a1c775ef83322105ab9c5d96265 (patch) | |
| tree | 611aee45eb5782c286dddf2e78713295b048cf18 /erts/emulator/beam | |
| parent | b5545594dd90bb6d1e049757050839a368730ecb (diff) | |
| parent | 3eddb0f762de248d3230b38bc9d478bfbc8e7331 (diff) | |
| download | otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.tar.gz otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.tar.bz2 otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.zip | |
Merge branch 'maint'
* maint:
Update copyright-year
Conflicts:
lib/dialyzer/src/dialyzer.hrl
lib/dialyzer/src/dialyzer_options.erl
lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer.hrl
lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer_races.erl
lib/hipe/icode/hipe_icode.erl
lib/hipe/main/hipe.erl
lib/hipe/main/hipe.hrl.src
lib/hipe/main/hipe_main.erl
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.h | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_msacc.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_msacc.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.h b/erts/emulator/beam/erl_hl_timer.h index 705be94532..9cdcd581a0 100644 --- a/erts/emulator/beam/erl_hl_timer.h +++ b/erts/emulator/beam/erl_hl_timer.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2015. All Rights Reserved. + * Copyright Ericsson AB 2015-2016. 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/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c index 421445fbad..7ddf49937f 100644 --- a/erts/emulator/beam/erl_msacc.c +++ b/erts/emulator/beam/erl_msacc.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2014-2015. All Rights Reserved. + * Copyright Ericsson AB 2014-2016. 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/beam/erl_msacc.h b/erts/emulator/beam/erl_msacc.h index 7e02d8e101..9ef86a1293 100644 --- a/erts/emulator/beam/erl_msacc.h +++ b/erts/emulator/beam/erl_msacc.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2014-2015. All Rights Reserved. + * Copyright Ericsson AB 2014-2016. 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. |