diff options
| author | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
| commit | 101a2bdd5c48f38803c274603844c69296a3b935 (patch) | |
| tree | fd9e949322565dde54ae26958b798fed4c3bc837 /lib/et/test | |
| parent | b56002c163ff5f811da902129dd4b2f37edc226d (diff) | |
| parent | f0e2f0b91ac4d45a64ddac511e0eba9b6ce01e92 (diff) | |
| download | otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.gz otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.bz2 otp-101a2bdd5c48f38803c274603844c69296a3b935.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/et/test')
| -rw-r--r-- | lib/et/test/Makefile | 2 | ||||
| -rw-r--r-- | lib/et/test/et_wx_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile index 2125f9622a..9a24e3281b 100644 --- a/lib/et/test/Makefile +++ b/lib/et/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2009-2010. All Rights Reserved. +# Copyright Ericsson AB 2009-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/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl index 6109ed4e04..b5f98f8616 100644 --- a/lib/et/test/et_wx_SUITE.erl +++ b/lib/et/test/et_wx_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2010. All Rights Reserved. +%% Copyright Ericsson AB 2009-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 |