[asterisk-commits] branch oej/subscribemwi-1.2 r13205 - in /team/oej/subscribemwi-1.2: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Mar 16 01:25:30 2006
New Revision: 13205

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

Modified:
    team/oej/subscribemwi-1.2/   (props changed)
    team/oej/subscribemwi-1.2/channels/chan_sip.c

Propchange: team/oej/subscribemwi-1.2/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/subscribemwi-1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 16 01:25:30 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-13189
+/branches/1.2:1-13204

Modified: team/oej/subscribemwi-1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi-1.2/channels/chan_sip.c?rev=13205&r1=13204&r2=13205&view=diff
==============================================================================
--- team/oej/subscribemwi-1.2/channels/chan_sip.c (original)
+++ team/oej/subscribemwi-1.2/channels/chan_sip.c Thu Mar 16 01:25:30 2006
@@ -10729,7 +10729,7 @@
 		ast_verbose("Ignoring this SUBSCRIBE request\n");
 
 	/* Find parameters to Event: header value and remove them for now */
-	eventparam = strchr(event, ";");
+	eventparam = strchr(event, ';');
 	if (eventparam) {
 		*eventparam = '\0';
 		eventparam++;