[svn-commits] branch murf/AEL-trunk-fixesonly r33397 - /team/murf/AEL-trunk-fixesonly/

[svn-commits at lists.digium.com]

Author: murf
Date: Fri Jun  9 17:39:28 2006
New Revision: 33397

URL: http://svn.digium.com/view/asterisk?rev=33397&view=rev
Log:
OK--- Reset the automerge prop after hand-merging some
small conflict in the generated lex file.



Modified:
    team/murf/AEL-trunk-fixesonly/   (props changed)

Propchange: team/murf/AEL-trunk-fixesonly/
------------------------------------------------------------------------------
    automerge = YouBetcha