diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
| commit | b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c (patch) | |
| tree | d1bcdaaf38253733570660bf63183ca65bc454a9 /lib/public_key/src | |
| parent | a5d14f14e04ca7ca5fd34a7811cefbccdd024ce4 (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.gz otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.bz2 otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.zip | |
Merge branch 'dev' into bmk/inets/httpd/make_mod_esi_deliver_accept_binary_data/OTP-9123
Diffstat (limited to 'lib/public_key/src')
| -rw-r--r-- | lib/public_key/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/public_key/src/pubkey_cert_records.erl | 2 | ||||
| -rw-r--r-- | lib/public_key/src/pubkey_pem.erl | 2 | ||||
| -rw-r--r-- | lib/public_key/src/public_key.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile index 51f405361b..b042b0c30a 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2008-2009. All Rights Reserved. +# Copyright Ericsson AB 2008-2011. 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/lib/public_key/src/pubkey_cert_records.erl b/lib/public_key/src/pubkey_cert_records.erl index 7a387e487c..2441cfc0e0 100644 --- a/lib/public_key/src/pubkey_cert_records.erl +++ b/lib/public_key/src/pubkey_cert_records.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. 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/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl index 78870e5cd7..c8c69bcdd0 100644 --- a/lib/public_key/src/pubkey_pem.erl +++ b/lib/public_key/src/pubkey_pem.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. 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/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index fad73e8e92..7e022da7e5 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. 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 |