aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/Makefile
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-03-25 12:55:19 +0100
committerErland Schönbeck <[email protected]>2015-03-25 12:55:19 +0100
commitd6797e9a34df677e82db5ee8b8388fbdf57f09f5 (patch)
tree1229a0acce281d4185d1ffcea44569947c31009c /lib/inets/src/inets_app/Makefile
parenta206e66f13471cdad02a966fcb569673e0938fa4 (diff)
parente10385909c687590d6522d007bba9d72f3f5c380 (diff)
downloadotp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.gz
otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.bz2
otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.zip
Merge branch 'erland/OTP18/inets/time_api/OTP-12441'
* erland/OTP18/inets/time_api/OTP-12441: inets: Add new module inets_time_compat with new time API The new module is backwards compatible.
Diffstat (limited to 'lib/inets/src/inets_app/Makefile')
-rw-r--r--lib/inets/src/inets_app/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 5d3f652441..926585f198 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -48,7 +48,8 @@ MODULES = \
inets_sup \
inets_regexp \
inets_trace \
- inets_lib
+ inets_lib \
+ inets_time_compat
INTERNAL_HRL_FILES = inets_internal.hrl
EXTERNAL_HRL_FILES = ../../include/httpd.hrl \