[asterisk-commits] mvanbaak: branch 1.6.2 r220632 - in /branches/1.6.2: ./ funcs/func_callerid.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Sun Sep 27 15:45:24 2009
New Revision: 220632

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220632
Log:
Merged revisions 220629 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220629 | mvanbaak | 2009-09-27 22:40:16 +0200 (Sun, 27 Sep 2009) | 3 lines
  
  add name argument for the CALLERID dialplan function to the xml documentation.
  Pointed out to me on IRC by snuff-home. Thanks
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/funcs/func_callerid.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/funcs/func_callerid.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/funcs/func_callerid.c?view=diff&rev=220632&r1=220631&r2=220632
==============================================================================
--- branches/1.6.2/funcs/func_callerid.c (original)
+++ branches/1.6.2/funcs/func_callerid.c Sun Sep 27 15:45:24 2009
@@ -17,7 +17,7 @@
 /*! \file
  *
  * \brief Caller ID related dialplan functions
- * 
+ *
  * \ingroup functions
  */
 
@@ -43,6 +43,7 @@
 				<enumlist>
 					<enum name="all" />
 					<enum name="num" />
+					<enum name="name" />
 					<enum name="ANI" />
 					<enum name="DNID" />
 					<enum name="RDNIS" />