[asterisk-commits] irroot: branch irroot/t38gateway-1.8 r322041 - /team/irroot/t38gateway-1.8/

[SVN commits to the Asterisk project]

Author: irroot
Date: Sun Jun  5 07:35:20 2011
New Revision: 322041

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322041
Log:
resolve conflict, enable automerge

Modified:
    team/irroot/t38gateway-1.8/   (props changed)
    team/irroot/t38gateway-1.8/configure

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

Propchange: team/irroot/t38gateway-1.8/
            ('svnmerge-integrated' removed)