[asterisk-commits] tilghman: trunk r299142 - in /trunk: ./ sample.call

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Dec 20 12:18:13 2010
New Revision: 299142

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

................
  r299138 | tilghman | 2010-12-20 12:17:28 -0600 (Mon, 20 Dec 2010) | 9 lines
  
  Merged revisions 299136 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r299136 | tilghman | 2010-12-20 12:16:37 -0600 (Mon, 20 Dec 2010) | 2 lines
    
    Documentation fix
  ........
................

Modified:
    trunk/   (props changed)
    trunk/sample.call

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

Modified: trunk/sample.call
URL: http://svnview.digium.com/svn/asterisk/trunk/sample.call?view=diff&rev=299142&r1=299141&r2=299142
==============================================================================
--- trunk/sample.call (original)
+++ trunk/sample.call Mon Dec 20 12:18:13 2010
@@ -72,7 +72,7 @@
 #Set: file1=/tmp/to
 #Set: file2=/tmp/msg
 #Set: timestamp=20021023104500
-#Set: CDR(userfield|r)=42
+#Set: CDR(userfield,r)=42
 
 #
 # Setting Archive to yes the call file is never deleted, but is moved