[svn-commits] branch kpfleming/trunk-test-for-merging - r8149 in /team/kpfleming/trunk-test...

[svn-commits at lists.digium.com]

Author: root
Date: Tue Jan 17 14:49:54 2006
New Revision: 8149

URL: http://svn.digium.com/view/asterisk?rev=8149&view=rev
Log:
automerge commit

Modified:
    team/kpfleming/trunk-test-for-merging/   (props changed)
    team/kpfleming/trunk-test-for-merging/apps/app_dial.c

Propchange: team/kpfleming/trunk-test-for-merging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 17 14:49:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-8146
+/trunk:1-8148

Modified: team/kpfleming/trunk-test-for-merging/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/trunk-test-for-merging/apps/app_dial.c?rev=8149&r1=8148&r2=8149&view=diff
==============================================================================
--- team/kpfleming/trunk-test-for-merging/apps/app_dial.c (original)
+++ team/kpfleming/trunk-test-for-merging/apps/app_dial.c Tue Jan 17 14:49:54 2006
@@ -449,7 +449,8 @@
 					char tmpchan[256];
 					char *stuff;
 					char *tech;
-					char *forward_context;
+					const char *forward_context;
+
 					ast_copy_string(tmpchan, o->chan->call_forward, sizeof(tmpchan));
 					if ((stuff = strchr(tmpchan, '/'))) {
 						*stuff = '\0';