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

Merged revisions 134050 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines

merging the zap_and_dahdi_trunk branch up to trunk


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-07-28 16:13:34 +00:00
parent 322153ad93
commit 7eb4b5bf5b
5 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/asterisk.c
View File

@@ -162,8 +162,6 @@ int option_maxfiles; /*!< Max number of open file handles (files, sockets) */
#if defined(HAVE_SYSINFO)
long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
#endif
char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP";
int dahdi_chan_name_len = 3;
/*! @} */