diff options
author | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
commit | 5c8338fcadd68589814a7098e001b036109c5ee7 (patch) | |
tree | 4a89c1feb52b8ec862cfa46c8b502ea3880217be /lib/megaco/src/engine/modules.mk | |
parent | f39098ac6f487f7142e4597930ee3bb709362c4a (diff) | |
parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
download | otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2 otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip |
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'lib/megaco/src/engine/modules.mk')
-rw-r--r-- | lib/megaco/src/engine/modules.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk index 44bcadc37b..4bc57cd63e 100644 --- a/lib/megaco/src/engine/modules.mk +++ b/lib/megaco/src/engine/modules.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2009. All Rights Reserved. +# Copyright Ericsson AB 2001-2011. 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 @@ -24,6 +24,7 @@ BEHAVIOUR_MODULES = \ MODULES = \ $(BEHAVIOUR_MODULES) \ + megaco_config_misc \ megaco_config \ megaco_digit_map \ megaco_erl_dist_encoder \ |