[svn-commits] rmudgett: branch rmudgett/aoc_event r259111 - in /team/rmudgett/aoc_event: ./...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Apr 26 17:07:19 2010
New Revision: 259111

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=259111
Log:
Merged revisions 259110 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/CCSS

................
  r259110 | rmudgett | 2010-04-26 17:04:03 -0500 (Mon, 26 Apr 2010) | 16 lines
  
  Merged revisions 259105 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ................
    r259105 | mmichelson | 2010-04-26 16:45:13 -0500 (Mon, 26 Apr 2010) | 9 lines
    
    Merged revisions 259104 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r259104 | mmichelson | 2010-04-26 16:44:43 -0500 (Mon, 26 Apr 2010) | 3 lines
      
      Let compilation succeed warning-free when DONT_OPTIMIZE is turned off.
    ........
  ................
................

Modified:
    team/rmudgett/aoc_event/   (props changed)
    team/rmudgett/aoc_event/main/channel.c

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- aoc_event-integrated (original)
+++ aoc_event-integrated Mon Apr 26 17:07:19 2010
@@ -1,1 +1,1 @@
-/team/group/CCSS:1-259080
+/team/group/CCSS:1-259110

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 26 17:07:19 2010
@@ -1,1 +1,1 @@
-/trunk:1-259026
+/trunk:1-259109

Modified: team/rmudgett/aoc_event/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/aoc_event/main/channel.c?view=diff&rev=259111&r1=259110&r2=259111
==============================================================================
--- team/rmudgett/aoc_event/main/channel.c (original)
+++ team/rmudgett/aoc_event/main/channel.c Mon Apr 26 17:07:19 2010
@@ -855,7 +855,7 @@
 	int x;
 	int flags;
 	struct varshead *headp;
-	char *tech;
+	char *tech = "";
 
 	/* If shutting down, don't allocate any new channels */
 	if (shutting_down) {