aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/old_httpd_SUITE_data
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-04-13 09:53:56 +0200
committerHenrik Nord <[email protected]>2016-04-13 09:53:56 +0200
commit08ab8c8534ecabb2797165f5508a8c42d4dae926 (patch)
treefb1d68ab6cdcdcc2e9db31aec3d0e3cff6c074c8 /lib/inets/test/old_httpd_SUITE_data
parent1579de1ff38471e70df20fcdd79c42c4a5a89a50 (diff)
parent6664eed554974336909d3ffe03f20349cc4c38fd (diff)
downloadotp-08ab8c8534ecabb2797165f5508a8c42d4dae926.tar.gz
otp-08ab8c8534ecabb2797165f5508a8c42d4dae926.tar.bz2
otp-08ab8c8534ecabb2797165f5508a8c42d4dae926.zip
Merge branch 'henrik/update-copyrightyear'
* henrik/update-copyrightyear: update copyright-year
Diffstat (limited to 'lib/inets/test/old_httpd_SUITE_data')
-rw-r--r--lib/inets/test/old_httpd_SUITE_data/server_root/Makefile2
-rw-r--r--lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
index 4f23295401..ed4d63a3bb 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1997-2010. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
index d94b245c25..3f9fde03b5 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.