aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-12-07 15:05:52 +0100
committerDan Gudmundsson <[email protected]>2016-12-07 15:05:52 +0100
commitba1d721c4af43a1c775ef83322105ab9c5d96265 (patch)
tree611aee45eb5782c286dddf2e78713295b048cf18 /lib/kernel
parentb5545594dd90bb6d1e049757050839a368730ecb (diff)
parent3eddb0f762de248d3230b38bc9d478bfbc8e7331 (diff)
downloadotp-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 'lib/kernel')
-rw-r--r--lib/kernel/src/global_group.erl2
-rw-r--r--lib/kernel/src/inet_tcp_dist.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/global_group.erl b/lib/kernel/src/global_group.erl
index 8ac0bd9551..f5ead2a4c5 100644
--- a/lib/kernel/src/global_group.erl
+++ b/lib/kernel/src/global_group.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1998-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index 3084bd599a..8c8fe86811 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.