diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 12:19:57 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 12:19:57 +0100 |
| commit | 6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce (patch) | |
| tree | 82e54daec07390bb4cad8b279e0e8d1fd0170b78 /lib/inets/test/httpd_test_data | |
| parent | 4f42486c2f94860c1aa8152562760b6a2aa7c5cb (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.tar.gz otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.tar.bz2 otp-6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce.zip | |
Merge branch 'dev' into bmk/inets/ftp/missing_spec_causes_dialyxer_problems/OTP-9114
Also fixed a bunch of "end-years" (was 2010 but should have been 2011,
which the commit hook not happy with).
Diffstat (limited to 'lib/inets/test/httpd_test_data')
| -rw-r--r-- | lib/inets/test/httpd_test_data/server_root/conf/httpd.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf b/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf index 8a74ed1afd..ceb94237d2 100644 --- a/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf +++ b/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2009. All Rights Reserved. +# Copyright Ericsson AB 1997-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 |