diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-02-26 01:05:15 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-02-26 01:05:15 +0000 |
| commit | 12432b9b9e19018695fac5540b6d8e5789a5263e (patch) | |
| tree | e9d03bf35067ff3fc66adca0fcd582a2376d2fa1 /apps/app_meetme.c | |
| parent | 4e752903bb95bcd22e82ee14fe993815d1e5e817 (diff) | |
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 2449edb42..862db9927 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -400,9 +400,6 @@ struct sla_trunk { /*! 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_ref { 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; }; |