aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_fax.c
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 15:39:45 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-03 15:39:45 +0000
commitf90164d3b4c87ca5d2a36976e8868595cc7ef9da (patch)
treea51fb7007557b14dd1ed01064321e155e7ce18bf /apps/app_fax.c
parenteef192b5686c869d09dcc685fdfdbc20cd02b0e6 (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 'apps/app_fax.c')
-rw-r--r--apps/app_fax.c4
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"