[asterisk-commits] russell: trunk r51340 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Jan 19 15:21:03 2007
New Revision: 51340

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51340
Log:
Merged revisions 51339 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51339 | russell | 2007-01-19 15:20:20 -0600 (Fri, 19 Jan 2007) | 2 lines

Remove a variable that was declared twice.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=51340&r1=51339&r2=51340
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Jan 19 15:21:03 2007
@@ -379,9 +379,6 @@
 	ASTOBJ_CONTAINER_COMPONENTS(struct ast_sla);
 } slas;
 
-static int audio_buffers;			/*!< The number of audio buffers to be allocated on pseudo channels
-						   when in a conference
-						*/
 /*! The number of audio buffers to be allocated on pseudo channels
  *  when in a conference */
 static int audio_buffers;