automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-01 21:05:01 +00:00
parent 1a02e1b9c1
commit 622352f2c9
9 changed files with 29 additions and 0 deletions

View File

@@ -44,6 +44,7 @@ extern int option_timestamp;
extern int option_transcode_slin;
extern int option_transmit_silence_during_record;
extern int option_maxcalls;
extern int option_highpriority;
extern double option_maxload;
extern int option_dontwarn;
extern int option_priority_jumping;