[asterisk-commits] jpeeler: branch jpeeler/srtp r103826 - /team/jpeeler/srtp/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Feb 19 15:24:08 2008
New Revision: 103826

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103826
Log:
added new merge properties

Modified:
    team/jpeeler/srtp/   (props changed)

Propchange: team/jpeeler/srtp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jpeeler/srtp/
------------------------------------------------------------------------------
    automerge-email = *

Propchange: team/jpeeler/srtp/
------------------------------------------------------------------------------
    svnmerge-integrated = *