[svn-commits] oej: trunk r46224 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Wed Oct 25 11:01:22 2006
New Revision: 46224

URL: http://svn.digium.com/view/asterisk?rev=46224&view=rev
Log:
Merge from 1.4

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=46224&r1=46223&r2=46224&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Oct 25 11:01:22 2006
@@ -16965,7 +16965,7 @@
 	sip_show_registry, "List SIP registration status",
 	show_reg_usage },
 
-	{ { "sip", "list", "settings", NULL },
+	{ { "sip", "show", "settings", NULL },
 	sip_show_settings, "List SIP global settings",
 	show_settings_usage },