kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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@43181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-18 16:02:39 +00:00
parent 1e4fd6f9b5
commit 8911aced89
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_math.c
View File

@@ -69,7 +69,8 @@ static char *math_descrip =
"Perform floating point calculation on number 1 to number 2 and \n" "Perform floating point calculation on number 1 to number 2 and \n"
"store the result in returnvar. Valid ops are: \n" "store the result in returnvar. Valid ops are: \n"
" +,-,/,*,%,<,>,>=,<=,==\n" " +,-,/,*,%,<,>,>=,<=,==\n"
"and behave as their C equivalents.\n"; "and behave as their C equivalents.\n"
" This application has been deprecated in favor of the MATH function.\n";
#define ADDFUNCTION 0 #define ADDFUNCTION 0
#define DIVIDEFUNCTION 1 #define DIVIDEFUNCTION 1

1
configs/indications.conf.sample
View File

@@ -420,6 +420,7 @@ dialrecall = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,400
record = 1400/425,0/15000 record = 1400/425,0/15000
info = 400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400 info = 400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400
stutter = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400 stutter = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400
unobtainable = 400/75,0/100,400/75,0/100,400/75,0/100,400/75,0/400
[pl] [pl]
description = Poland description = Poland

5
configs/zapata.conf.sample
View File

@@ -237,7 +237,10 @@ usecallerid=yes
; ;
hidecallerid=no hidecallerid=no
; ;
; Whether or not to enable call waiting on FXO lines ; Whether or not to enable call waiting on internal extensions
; With this set to 'yes', busy extensions will hear the call-waiting
; tone, and can use hook-flash to switch between callers. The Dial()
; app will not return the "BUSY" result for extensions.
; ;
callwaiting=yes callwaiting=yes
; ;