[asterisk-commits] branch russell/autoconf_and_menuselect - r8197 /team/russell/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Jan 18 15:40:42 2006
New Revision: 8197

URL: http://svn.digium.com/view/asterisk?rev=8197&view=rev
Log:
now that conflicts are resolved, re-add the automerge property

Modified:
    team/russell/autoconf_and_menuselect/   (props changed)

Propchange: team/russell/autoconf_and_menuselect/
------------------------------------------------------------------------------
    automerge = automerge-r0x0rz