[svn-commits] oej: branch oej/pinetree-1.4 r202882 - in /team/oej/pinetree-1.4: ./ res/

[SVN commits to the Digium repositories]

Author: oej
Date: Wed Jun 24 06:21:06 2009
New Revision: 202882

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202882
Log:
Resolving stuff

Modified:
    team/oej/pinetree-1.4/   (props changed)
    team/oej/pinetree-1.4/res/res_features.c

Propchange: team/oej/pinetree-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 24 06:21:06 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-202718
+/branches/1.4:1-193188

Modified: team/oej/pinetree-1.4/res/res_features.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/res/res_features.c?view=diff&rev=202882&r1=202881&r2=202882
==============================================================================
--- team/oej/pinetree-1.4/res/res_features.c (original)
+++ team/oej/pinetree-1.4/res/res_features.c Wed Jun 24 06:21:06 2009
@@ -1734,6 +1734,7 @@
 			ast_set_flag(chan_cdr, AST_CDR_FLAG_MAIN);
 			ast_cdr_update(chan);
 			bridge_cdr = ast_cdr_dup(chan_cdr);
+
 			/* rip any forked CDR's off of the chan_cdr and attach
 			 * them to the bridge_cdr instead */
 			bridge_cdr->next = chan_cdr->next;