[asterisk-commits] file: branch file/bridging-softmixgen2 r180790 - /team/file/bridging-softmixg...

[SVN commits to the Asterisk project]

Author: file
Date: Mon Mar  9 21:20:06 2009
New Revision: 180790

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180790
Log:
No merging? *gasp*

Modified:
    team/file/bridging-softmixgen2/   (props changed)

Propchange: team/file/bridging-softmixgen2/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/bridging-softmixgen2/
------------------------------------------------------------------------------
    automerge-email = jcolp at digium.com

Propchange: team/file/bridging-softmixgen2/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-180642