diff options
| author | Matthew Nicholson <mnicholson@digium.com> | 2010-03-03 15:39:45 +0000 |
|---|---|---|
| committer | Matthew Nicholson <mnicholson@digium.com> | 2010-03-03 15:39:45 +0000 |
| commit | 8ef8706944f747d8bf8863a0e52ccacff9efb485 (patch) | |
| tree | a51fb7007557b14dd1ed01064321e155e7ce18bf /apps | |
| parent | ba1a8d3ff04f46643c81efd54ef195ca588f1f78 (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: https://origsvn.digium.com/svn/asterisk/trunk@250302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_fax.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_fax.c b/apps/app_fax.c index a5afe87dd..a664b1c96 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -13,7 +13,9 @@ */ /*** MODULEINFO - <depend>spandsp</depend> + <defaultenabled>no</defaultenabled> + <depend>spandsp</depend> + <conflict>res_fax</conflict> ***/ #include "asterisk.h" |