Merged revisions 44322 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 4 Oct 2006 00:26:21 +0000 (00:26 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 4 Oct 2006 00:26:21 +0000 (00:26 +0000)
commit41eb95e0557780e77042b979ffc151532e866b6d
treedb50802df6ebd873ba2c249b4c9a094410bcea5a
parent7294ba38521f6af7746f76264919cb4739966792
Merged revisions 44322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines

ensure that local include files are always used
avoid a duplicate function name (term_init())

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Makefile
include/asterisk.h
main/asterisk.c
main/loader.c
main/term.c