kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-30 02:06:27 +00:00
parent c116009930
commit b4d9cb0418
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_groupcount.c
View File

@@ -257,8 +257,8 @@ static char *group_count_descrip =
" Calculates the group count for the specified group, or uses\n" " Calculates the group count for the specified group, or uses\n"
"the current channel's group if not specifed (and non-empty).\n" "the current channel's group if not specifed (and non-empty).\n"
"Stores result in GROUPCOUNT. \n" "Stores result in GROUPCOUNT. \n"
"This application has been deprecated, please use the function\n" "Note: This application has been deprecated, please use the function\n"
"GroupCount.\n"; "GROUP_COUNT.\n";
static char *group_set_descrip = static char *group_set_descrip =
"Usage: SetGroup(groupname[@category])\n" "Usage: SetGroup(groupname[@category])\n"
@@ -284,8 +284,8 @@ static char *group_match_count_descrip =
" Calculates the group count for all groups that match the specified\n" " Calculates the group count for all groups that match the specified\n"
"pattern. Uses standard regular expression matching (see regex(7)).\n" "pattern. Uses standard regular expression matching (see regex(7)).\n"
"Stores result in GROUPCOUNT. Always returns 0.\n" "Stores result in GROUPCOUNT. Always returns 0.\n"
"This application has been deprecated, please use the function\n" "Note: This application has been deprecated, please use the function\n"
"GroupMatchCount.\n"; "GROUP_MATCH_COUNT.\n";
static char show_channels_usage[] = static char show_channels_usage[] =
"Usage: group show channels [pattern]\n" "Usage: group show channels [pattern]\n"

1
res/res_features.c
View File

@@ -1975,6 +1975,7 @@ static int load_config(void)
parking_start = 701; parking_start = 701;
parking_stop = 750; parking_stop = 750;
parkfindnext = 0; parkfindnext = 0;
adsipark = 0;
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT; transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT; featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;