diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
| commit | dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8 (patch) | |
| tree | 34db633841db4d5d9ec41ee198823292a711e7a4 /lib/inets | |
| parent | 0dc1b3b039628cb154fa04dd06b0a138f95b6e7e (diff) | |
| parent | 0534391319767818b036dbce212610a7372da692 (diff) | |
| download | otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.gz otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.bz2 otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 2 | ||||
| -rw-r--r-- | lib/inets/test/inets_app_test.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml index 8497d91549..3fced5dfcd 100644 --- a/lib/inets/doc/src/httpd.xml +++ b/lib/inets/doc/src/httpd.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1997</year><year>2011</year> + <year>1997</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index 5e0bd39cb3..0f47d785ef 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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/inets/test/inets_app_test.erl b/lib/inets/test/inets_app_test.erl index d32f7e290b..eabfa69f7c 100644 --- a/lib/inets/test/inets_app_test.erl +++ b/lib/inets/test/inets_app_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2011. All Rights Reserved. +%% Copyright Ericsson AB 2002-2012. 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 |