Moises Silva 7bd2d154d6 Merge branch 'smgmaster' into releases.3.4.experimental_head ...

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_relay.c
	src/mod/endpoints/mod_sofia/mod_sofia.c
	src/mod/endpoints/mod_sofia/sofia_glue.c

2011-12-17 17:42:34 -05:00

..

freetdm.conf

freetdm: fix cpu monitor inconsistent messages, variable names etc

2011-12-01 12:21:46 -05:00

freetdm.conf.xml

OPENZAP-112 --resolve

2011-08-06 21:32:21 -04:00

pika.conf

freetdm: add some comments to sample configurations

2010-09-29 16:51:00 -04:00

tones.conf

conf/tones.conf from wiki page why nobody bothered to submit a jira so they would be included instead putting them on the wiki to be overlooked

2011-08-22 19:27:03 -05:00

wanpipe.conf

freetdm: add support for setting the channel tx/rx queue size from config file (wanpipe.conf) and from CLI

2011-03-21 14:25:20 -04:00

zt.conf

OPENZAP-74 thx Raul see you at ClueCon

2009-06-04 16:18:22 +00:00