automerge commit

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

View File

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