[svn-commits] tilghman: branch tilghman/compiler_attributes r115154 - /team/tilghman/compil...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu May  1 18:44:56 2008
New Revision: 115154

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115154
Log:
Set up automerge

Modified:
    team/tilghman/compiler_attributes/   (props changed)

Propchange: team/tilghman/compiler_attributes/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/tilghman/compiler_attributes/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-111992