[asterisk-commits] branch murf/AEL-fix2 r37894 - /team/murf/AEL-fix2/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue Jul 18 13:53:30 2006
New Revision: 37894

URL: http://svn.digium.com/view/asterisk?rev=37894&view=rev
Log:
set up the automerge and svnmerge init stuff.


Modified:
    team/murf/AEL-fix2/   (props changed)

Propchange: team/murf/AEL-fix2/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/murf/AEL-fix2/
------------------------------------------------------------------------------
    automerge-email = murf at digium.com

Propchange: team/murf/AEL-fix2/
            ('branch-1.2-blocked' removed)

Propchange: team/murf/AEL-fix2/
            ('branch-1.2-merged' removed)

Propchange: team/murf/AEL-fix2/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-37892