diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
| commit | 473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch) | |
| tree | 689908bd116af888e4ed7659da9b7c4af9ba4c7d /lib/asn1/src | |
| parent | 7b9f93973c877af5be57add78bc0d00321ed5931 (diff) | |
| parent | 710b07ca18417976459335a8b0b81a6f6aa82699 (diff) | |
| download | otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2 otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/asn1/src')
| -rw-r--r-- | lib/asn1/src/asn1_db.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_func.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_name.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_parser2.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/asn1/src/asn1_db.erl b/lib/asn1/src/asn1_db.erl index e96ca9ae25..869b36ddbd 100644 --- a/lib/asn1/src/asn1_db.erl +++ b/lib/asn1/src/asn1_db.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. 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/asn1/src/asn1ct_func.erl b/lib/asn1/src/asn1ct_func.erl index 262bef6862..ab0dbcce8f 100644 --- a/lib/asn1/src/asn1ct_func.erl +++ b/lib/asn1/src/asn1ct_func.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012. All Rights Reserved. +%% Copyright Ericsson AB 2012-2013. 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/asn1/src/asn1ct_name.erl b/lib/asn1/src/asn1ct_name.erl index c0c2ed302c..ba52e66ce3 100644 --- a/lib/asn1/src/asn1ct_name.erl +++ b/lib/asn1/src/asn1ct_name.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. 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/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl index 344fdf44dd..1abccc8626 100644 --- a/lib/asn1/src/asn1ct_parser2.erl +++ b/lib/asn1/src/asn1ct_parser2.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2012. All Rights Reserved. +%% Copyright Ericsson AB 2000-2013. 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 |