aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-29 18:12:11 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-29 18:12:11 +0200
commit622daf3b96666f8bbabec44a15b26a188a83b95e (patch)
tree706377087e70525e9bdc68b2f98911d56b915e5d /lib/asn1
parent09c46998b3a4b0060b3ff3799c142d564f91f517 (diff)
parent5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff)
downloadotp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz
otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2
otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip
Merge branch 'dev' into major
* dev: Update copyright years
Diffstat (limited to 'lib/asn1')
-rw-r--r--lib/asn1/test/test_compile_options.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 5cb212eddf..a622d5bfd2 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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