[asterisk-commits] irroot: branch irroot/t38gateway-trunk r326049 - in /team/irroot/t38gateway-t...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Jul  1 09:03:22 2011
New Revision: 326049

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=326049
Log:
Resolve conflict in res_fax / enable automerge

Modified:
    team/irroot/t38gateway-trunk/   (props changed)
    team/irroot/t38gateway-trunk/res/res_fax.c

Propchange: team/irroot/t38gateway-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/t38gateway-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul  1 09:03:22 2011
@@ -1,1 +1,1 @@
-/trunk:1-325937
+/trunk:1-326048

Modified: team/irroot/t38gateway-trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-trunk/res/res_fax.c?view=diff&rev=326049&r1=326048&r2=326049
==============================================================================
--- team/irroot/t38gateway-trunk/res/res_fax.c (original)
+++ team/irroot/t38gateway-trunk/res/res_fax.c Fri Jul  1 09:03:22 2011
@@ -46,7 +46,7 @@
  * \author Kevin P. Fleming <kpfleming at digium.com>
  * \author Matthew Nicholson <mnicholson at digium.com>
  * \author Gregory H. Nietsky  <gregory at distrotech.co.za>
- *
+ * 
  * A generic FAX resource module that provides SendFAX and ReceiveFAX applications.
  * This module requires FAX technology modules, like res_fax_spandsp, to register with it
  * so it can use the technology modules to perform the actual FAX transmissions.