aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-06-12 19:48:36 +0200
committerBjörn-Egil Dahlberg <[email protected]>2013-06-12 19:48:36 +0200
commit473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch)
tree689908bd116af888e4ed7659da9b7c4af9ba4c7d /lib/common_test/src
parent7b9f93973c877af5be57add78bc0d00321ed5931 (diff)
parent710b07ca18417976459335a8b0b81a6f6aa82699 (diff)
downloadotp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz
otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2
otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src')
-rw-r--r--lib/common_test/src/ct_ftp.erl2
-rw-r--r--lib/common_test/src/ct_ssh.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl
index b91a521bd4..71fd8754ff 100644
--- a/lib/common_test/src/ct_ftp.erl
+++ b/lib/common_test/src/ct_ftp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-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/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl
index 1adc79d358..974791bd70 100644
--- a/lib/common_test/src/ct_ssh.erl
+++ b/lib/common_test/src/ct_ssh.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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