summaryrefslogtreecommitdiff
path: root/lib/et
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2013-06-12 19:48:36 +0200
committerBjörn-Egil Dahlberg <egil@erlang.org>2013-06-12 19:48:36 +0200
commit473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch)
tree689908bd116af888e4ed7659da9b7c4af9ba4c7d /lib/et
parent7b9f93973c877af5be57add78bc0d00321ed5931 (diff)
parent710b07ca18417976459335a8b0b81a6f6aa82699 (diff)
downloaderlang-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz
Merge branch 'maint'
Diffstat (limited to 'lib/et')
-rw-r--r--lib/et/src/et_collector.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl
index ce8cf6d4e0..a78b30c419 100644
--- a/lib/et/src/et_collector.erl
+++ b/lib/et/src/et_collector.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2010. 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