diff options
author | Erlang/OTP <[email protected]> | 2015-06-01 12:06:30 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-06-01 12:06:30 +0200 |
commit | 3bdac8db40a1e57699514fad9d5e93b79b01a3ed (patch) | |
tree | 2068adfe48e8197f526d7a56c0e1f04d7cd388fa /lib/inets/src/http_server/Makefile | |
parent | f3fefbae24a2569a13b538d80d0e99129963ebef (diff) | |
parent | 5dc49ed64e451026d9ced653f6f58e3fa0fb42e4 (diff) | |
download | otp-3bdac8db40a1e57699514fad9d5e93b79b01a3ed.tar.gz otp-3bdac8db40a1e57699514fad9d5e93b79b01a3ed.tar.bz2 otp-3bdac8db40a1e57699514fad9d5e93b79b01a3ed.zip |
Merge branch 'ia/inets/filter-headers/OTP-12776' into maint-17
* ia/inets/filter-headers/OTP-12776:
inets: Prepare for release
inets: Add customize option
Diffstat (limited to 'lib/inets/src/http_server/Makefile')
-rw-r--r-- | lib/inets/src/http_server/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile index 2660d04d16..636d580e28 100644 --- a/lib/inets/src/http_server/Makefile +++ b/lib/inets/src/http_server/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2005-2013. All Rights Reserved. +# Copyright Ericsson AB 2005-2015. 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 @@ -46,6 +46,7 @@ MODULES = \ httpd_connection_sup\ httpd_cgi \ httpd_conf \ + httpd_custom \ httpd_example \ httpd_esi \ httpd_file\ |