[svn-commits] branch oej/test-this-branch r33699 - /team/oej/test-this-branch/channels/

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Jun 12 16:00:49 2006
New Revision: 33699

URL: http://svn.digium.com/view/asterisk?rev=33699&view=rev
Log:
Resolve conflict, reset

Modified:
    team/oej/test-this-branch/channels/chan_sip.c

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=33699&r1=33698&r2=33699&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Mon Jun 12 16:00:49 2006
@@ -1259,7 +1259,6 @@
 static void extract_uri(struct sip_pvt *p, struct sip_request *req);
 static void sip_registry_destroy(struct sip_registry *reg);
 static int sip_send_mwi_to_peer(struct sip_peer *peer);
-static int sip_scheddestroy(struct sip_pvt *p, int ms);
 
 /*------ T38 Support --------- */
 #ifdef T38_DEBUG