[asterisk-commits] branch kpfleming/test-for-merging - r7255 /team/kpfleming/test-for-merging/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec  1 12:57:19 2005
New Revision: 7255

URL: http://svn.digium.com/view/asterisk?rev=7255&view=rev
Log:
set some properties for merging

Modified:
    team/kpfleming/test-for-merging/   (props changed)

Propchange: team/kpfleming/test-for-merging/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kpfleming/test-for-merging/
------------------------------------------------------------------------------
    automerge_email = kpfleming at digium.com

Propchange: team/kpfleming/test-for-merging/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.2:1-7252