[asterisk-commits] rmudgett: trunk r335722 - in /trunk: ./ apps/app_directed_pickup.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Sep 13 17:11:20 2011
New Revision: 335722

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

................
  r335721 | rmudgett | 2011-09-13 17:10:44 -0500 (Tue, 13 Sep 2011) | 9 lines
  
  Merged revisions 335720 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335720 | rmudgett | 2011-09-13 17:10:15 -0500 (Tue, 13 Sep 2011) | 1 line
    
    Remove obsolete todo comment about PICKUPRESULT.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_directed_pickup.c

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

Modified: trunk/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=335722&r1=335721&r2=335722
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Tue Sep 13 17:11:20 2011
@@ -101,7 +101,6 @@
 
 static const char app[] = "Pickup";
 static const char app2[] = "PickupChan";
-/*! \todo This application should return a result code, like PICKUPRESULT */
 
 struct pickup_by_name_args {
 	const char *name;