[asterisk-commits] mmichelson: branch mmichelson/res_timing_timerfd r154577 - /team/mmichelson/r...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Nov  5 07:02:39 2008
New Revision: 154577

URL: http://svn.digium.com/view/asterisk?view=rev&rev=154577
Log:
Initialize automerge. I got a GnuTLS internal error
when I tried to svnmerge init last night from my
Ubuntu 8.10 box, so I've had to do this on a separate
machine. I'm not sure if this is a problem on my end
or the server. Hopefully checkins will work properly.

Modified:
    team/mmichelson/res_timing_timerfd/   (props changed)

Propchange: team/mmichelson/res_timing_timerfd/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/res_timing_timerfd/
------------------------------------------------------------------------------
    automerge-email = mmichelson at digium.com

Propchange: team/mmichelson/res_timing_timerfd/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-154504