[asterisk-commits] russell: branch 1.6.1 r184517 - in /branches/1.6.1: ./ main/file.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Mar 26 20:44:09 2009
New Revision: 184517

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184517
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.1/   (props changed)
    branches/1.6.1/main/file.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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