Merge config updates (bug #3406)
authorMark Spencer <markster@digium.com>
Tue, 25 Jan 2005 06:10:20 +0000 (06:10 +0000)
committerMark Spencer <markster@digium.com>
Tue, 25 Jan 2005 06:10:20 +0000 (06:10 +0000)
commit5f726ad8c72afd54c2909f25f2eab36e937321ab
tree5e740f79246c281ef1bc43bcffc87fd21f676005
parenta611ce04f16e647cf072a380579cb3d64c538645
Merge config updates (bug #3406)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
49 files changed:
.cleancount
Makefile
apps/app_alarmreceiver.c
apps/app_directory.c
apps/app_enumlookup.c
apps/app_festival.c
apps/app_meetme.c
apps/app_privacy.c
apps/app_queue.c
apps/app_realtime.c
apps/app_rpt.c
apps/app_txtcidname.c
apps/app_voicemail.c
asterisk.c
cdr/cdr_manager.c
cdr/cdr_odbc.c
cdr/cdr_pgsql.c
cdr/cdr_tds.c
channels/chan_agent.c
channels/chan_alsa.c
channels/chan_h323.c
channels/chan_iax2.c
channels/chan_mgcp.c
channels/chan_modem.c
channels/chan_oss.c
channels/chan_phone.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_vpb.c
channels/chan_zap.c
channels/iax2-provision.c
codecs/codec_speex.c
config.c
enum.c
include/asterisk/config.h
loader.c
logger.c
manager.c
pbx/pbx_config.c
pbx/pbx_dundi.c
pbx/pbx_realtime.c
res/res_adsi.c
res/res_config_odbc.c
res/res_features.c
res/res_indications.c
res/res_musiconhold.c
res/res_odbc.c
res/res_osp.c
rtp.c