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 /res/res_fax.c | |
| 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 'res/res_fax.c')
| -rw-r--r-- | res/res_fax.c | 4 |
1 files changed, 4 insertions, 0 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 |