diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-03 15:39:45 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-03 15:39:45 +0000 |
| commit | f90164d3b4c87ca5d2a36976e8868595cc7ef9da (patch) | |
| tree | a51fb7007557b14dd1ed01064321e155e7ce18bf /res | |
| parent | eef192b5686c869d09dcc685fdfdbc20cd02b0e6 (diff) | |
Updated CHANGES file to mention res_fax and res_fax_spandsp.
Also fixed MODULEINFO depends and conflicts for app_fax, res_fax, and res_fax_spandsp.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@250302 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_fax.c | 4 | ||||
| -rw-r--r-- | res/res_fax_spandsp.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 36ca2601b..e37fe1ded 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -17,6 +17,10 @@ * at the top of the source tree. */ +/*** MODULEINFO + <conflict>app_fax</conflict> +***/ + /*! \file * * \brief Generic FAX Resource for FAX technology resource modules diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c index 630cccb3b..9a84d28f6 100644 --- a/res/res_fax_spandsp.c +++ b/res/res_fax_spandsp.c @@ -26,7 +26,8 @@ */ /*** MODULEINFO - <depend>spandsp</depend> + <depend>spandsp</depend> + <depend>res_fax</depend> ***/ #include "asterisk.h" |