[svn-commits] russell: trunk r56742 - in /trunk: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Feb 25 19:05:15 2007
New Revision: 56742

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

........
r56740 | russell | 2007-02-25 19:04:40 -0600 (Sun, 25 Feb 2007) | 2 lines

Move a comment to be in the correct struct.

........

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=56742&r1=56741&r2=56742
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Sun Feb 25 19:05:15 2007
@@ -400,9 +400,6 @@
 	/*! Number of stations that have this trunk on hold. */
 	unsigned int hold_stations;
 	struct ast_channel *chan;
-	/*! Ring timeout to use when this trunk is ringing on this specific
-	 *  station.  This takes higher priority than a ring timeout set at
-	 *  the station level. */
 	unsigned int ring_timeout;
 };
 
@@ -411,6 +408,9 @@
 	struct sla_trunk *trunk;
 	enum sla_trunk_state state;
 	struct ast_channel *chan;
+	/*! Ring timeout to use when this trunk is ringing on this specific
+	 *  station.  This takes higher priority than a ring timeout set at
+	 *  the station level. */
 	unsigned int ring_timeout;
 };