[asterisk-commits] file: branch file/rtp_engine r123008 - /team/file/rtp_engine/

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jun 16 10:02:46 2008
New Revision: 123008

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123008
Log:
Setup merging properties.

Modified:
    team/file/rtp_engine/   (props changed)

Propchange: team/file/rtp_engine/
------------------------------------------------------------------------------
    automerge = *

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

Propchange: team/file/rtp_engine/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-123006