[asterisk-commits] branch oej/test-this-branch r13234 - in /team/oej/test-this-branch: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Mar 16 03:20:41 2006
New Revision: 13234

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

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/channels/chan_sip.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 16 03:20:41 2006
@@ -1,1 +1,1 @@
-/trunk:1-13190
+/trunk:1-13233

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=13234&r1=13233&r2=13234&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Thu Mar 16 03:20:41 2006
@@ -11014,7 +11014,7 @@
 
 
 	/* Find parameters to Event: header value and remove them for now */
-	eventparam = strchr(event, ";");
+	eventparam = strchr(event, ';');
 	if (eventparam) {
 		*eventparam = '\0';
 		eventparam++;