Merged revisions 134050 via svnmerge from

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

View File

@@ -141,8 +141,6 @@ extern struct timeval ast_lastreloadtime;
extern pid_t ast_mainpid;
extern char record_cache_dir[AST_CACHE_DIR_LEN];
extern char dahdi_chan_name[AST_CHANNEL_NAME];
extern int dahdi_chan_name_len;
extern int ast_language_is_prefix;