diff options
author | Siri Hansen <[email protected]> | 2017-05-19 15:27:46 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2017-05-19 15:27:46 +0200 |
commit | 52ace0d2c565a67e587159780114792c55244312 (patch) | |
tree | 1b21b16cc9c14cf78f4c9ed30f302bd8165a8736 /bootstrap/lib/kernel/include/inet.hrl | |
parent | 7ff352ef8a5393a017ce493ba1a1fc3be54be245 (diff) | |
parent | a237426d43b73d931739d9acb86a17513b44ed3e (diff) | |
download | otp-52ace0d2c565a67e587159780114792c55244312.tar.gz otp-52ace0d2c565a67e587159780114792c55244312.tar.bz2 otp-52ace0d2c565a67e587159780114792c55244312.zip |
Merge branch 'master' into jv-gen-server-exits
Diffstat (limited to 'bootstrap/lib/kernel/include/inet.hrl')
-rw-r--r-- | bootstrap/lib/kernel/include/inet.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/kernel/include/inet.hrl b/bootstrap/lib/kernel/include/inet.hrl index df788aca08..daa2e14b46 100644 --- a/bootstrap/lib/kernel/include/inet.hrl +++ b/bootstrap/lib/kernel/include/inet.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2016. All Rights Reserved. +%% Copyright Ericsson AB 1997-2017. 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. |