[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r321980 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat Jun  4 02:57:54 2011
New Revision: 321980

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321980
Log:
Fixup Merge

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/channels/chan_iax2.c
    team/irroot/distrotech-customers-trunk/configure   (contents, props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Modified: team/irroot/distrotech-customers-trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_iax2.c?view=diff&rev=321980&r1=321979&r2=321980
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_iax2.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_iax2.c Sat Jun  4 02:57:54 2011
@@ -1282,10 +1282,7 @@
 {
 	if (!network_change_event_subscription) {
 		network_change_event_subscription = ast_event_subscribe(AST_EVENT_NETWORK_CHANGE,
-			network_change_event_cb,
-			"SIP Network Change ",
-			NULL,
-			AST_EVENT_IE_END);
+			network_change_event_cb, "IAX2 Network Change", NULL, AST_EVENT_IE_END);
 	}
 }
 

Propchange: team/irroot/distrotech-customers-trunk/configure
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat Jun  4 02:57:54 2011
@@ -1,1 +1,1 @@
-application/octet-stream
+plain/text