diff options
| author | Henrik Nord <[email protected]> | 2016-05-04 12:54:05 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2016-05-04 12:54:05 +0200 |
| commit | 91d372e23e1d19bb0c5200ba1682f9e4bc57ed76 (patch) | |
| tree | 79eedbd59410d013190e63373b1e7c25d6a7862c /lib/inets/src/inets_app/Makefile | |
| parent | 4c8fdca47c9e727dfcc1ab2049ffea35cef76b39 (diff) | |
| parent | 1ab69efa960703b86a13ea6ba96f4fd56f1565f9 (diff) | |
| download | otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.gz otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.tar.bz2 otp-91d372e23e1d19bb0c5200ba1682f9e4bc57ed76.zip | |
Merge branch 'maint-18'
Conflicts:
OTP_VERSION
lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
lib/common_test/vsn.mk
Diffstat (limited to 'lib/inets/src/inets_app/Makefile')
| -rw-r--r-- | lib/inets/src/inets_app/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile index 1d870c14e8..a294381f67 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -49,7 +49,8 @@ MODULES = \ inets_sup \ inets_trace \ inets_lib \ - inets_time_compat + inets_time_compat \ + inets_regexp INTERNAL_HRL_FILES = inets_internal.hrl EXTERNAL_HRL_FILES = ../../include/httpd.hrl \ |