diff options
author | Micael Karlberg <[email protected]> | 2011-03-17 12:24:59 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-17 12:24:59 +0100 |
commit | ffb2d69e00ef283eeb266f3082067429b6ce1127 (patch) | |
tree | 134573a992cfcc23dad544eae9c5650f97d0e208 /lib/kernel/test/file_name_SUITE.erl | |
parent | bf6a8c53023a284b9f2de8d13538db1ab3ff8dee (diff) | |
parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
download | otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.gz otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.bz2 otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.zip |
Merge branch 'dev' into bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124
Diffstat (limited to 'lib/kernel/test/file_name_SUITE.erl')
-rw-r--r-- | lib/kernel/test/file_name_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl index 33c8e5bbe4..53bcb1162d 100644 --- a/lib/kernel/test/file_name_SUITE.erl +++ b/lib/kernel/test/file_name_SUITE.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 |