[svn-commits] russell: branch 1.6.2 r184518 - in /branches/1.6.2: ./ main/file.c

Thu Mar 26 20:45:02 CDT 2009

Author: russell
Date: Thu Mar 26 20:45:01 2009
New Revision: 184518

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184518
Log:
Merged revisions 184515 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r184515 | russell | 2009-03-26 20:40:28 -0500 (Thu, 26 Mar 2009) | 2 lines

Don't act surprised if we get a -1 indication.

........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/file.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------

--- trunk-merged (original)
+++ trunk-merged Thu Mar 26 20:45:01 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183652,183701,183766,183865,183914,184037,184043,184079,184147,184151,184219-184220,184280,184339,184344,184448,184512
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183652,183701,183766,183865,183914,184037,184043,184079,184147,184151,184219-184220,184280,184339,184344,184448,184512,184515

Modified: branches/1.6.2/main/file.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/file.c?view=diff&rev=184518&r1=184517&r2=184518
==============================================================================
--- branches/1.6.2/main/file.c (original)
+++ branches/1.6.2/main/file.c Thu Mar 26 20:45:01 2009
@@ -1234,6 +1234,7 @@
 				case AST_CONTROL_SRCUPDATE:
 				case AST_CONTROL_HOLD:
 				case AST_CONTROL_UNHOLD:
+				case -1:
 					/* Unimportant */
 					break;
 				default:


