[asterisk-commits] jpeeler: trunk r304340 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jan 26 16:27:51 2011
New Revision: 304340

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304340
Log:
Merged revisions 304339 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304339 | jpeeler | 2011-01-26 16:27:30 -0600 (Wed, 26 Jan 2011) | 9 lines
  
  Merged revisions 304338 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304338 | jpeeler | 2011-01-26 16:26:37 -0600 (Wed, 26 Jan 2011) | 2 lines
    
    Change delimiter used internally for GOTO_ON_BLINDXFR to commas to match 76703.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=304340&r1=304339&r2=304340
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Jan 26 16:27:51 2011
@@ -722,7 +722,7 @@
 
 	for (x = goto_on_transfer; x && *x; x++) {
 		if (*x == '^')
-			*x = '|';
+			*x = ',';
 	}
 	/* Make formats okay */
 	xferchan->readformat = chan->readformat;