[asterisk-commits] russell: branch russell/chan_refcount r84786 - in /team/russell/chan_refcount...

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Oct  5 11:59:06 2007
New Revision: 84786

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84786
Log:
ignore conflicting change to chan_zap

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/channels/chan_zap.c

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct  5 11:59:06 2007
@@ -1,1 +1,1 @@
-/trunk:1-84768
+/trunk:1-84785

Modified: team/russell/chan_refcount/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_zap.c?view=diff&rev=84786&r1=84785&r2=84786
==============================================================================
--- team/russell/chan_refcount/channels/chan_zap.c (original)
+++ team/russell/chan_refcount/channels/chan_zap.c Fri Oct  5 11:59:06 2007
@@ -3640,6 +3640,7 @@
 
 		/* Here's our main loop...  Start by locking things, looking for private parts, 
 		   and then balking if anything is wrong */
+
 		ast_channel_lock_both(c0, c1);
 
 		p0 = c0->tech_pvt;